Use another unix domain socket abstract name when in debug mode

Author: antoyo

config/keys

@@ -56,7 +56,7 @@ nmap ]] click-next-page
 fmap <Esc> hide-hints
 imap <Esc> normal
 
-cmap <C-r> delete-selected-bookmark
+cmap <C-D> delete-selected-bookmark
 cmap <C-n> complete-next
 cmap <C-p> complete-previous
 

src/message_server.rs

@@ -44,7 +44,7 @@ use tokio_io::io::WriteHalf;
 use tokio_serde_bincode::{ReadBincode, WriteBincode};
 use webkit2gtk::WebContext;
 
-use titanium_common::{ExtensionId, InnerMessage, Message, PageId, PATH};
+use titanium_common::{ExtensionId, InnerMessage, Message, PageId, SOCKET_NAME};
 use titanium_common::InnerMessage::{Id, Open};
 
 use app::{self, App};
@@ -200,7 +200,7 @@ impl MessageServer {
         // TODO: should be removed on Drop instead (or the connection close should remove it
         // automatically?).
         let listener =
-            match UnixListener::bind_abstract(PATH, &cx) {
+            match UnixListener::bind_abstract(SOCKET_NAME, &cx) {
                 Err(nix::Error::Sys(nix::Errno::EADDRINUSE)) => {
                     // A titanium process is already running, so we send the URL to this process so
                     // that it can open a new window.
@@ -357,7 +357,7 @@ fn dialog_and_exit(message: &str) -> ! {
 
 fn send_url_to_existing_process(url: &[String]) -> Result<()> {
     let cx = MainContext::default(|cx| cx.clone());
-    let stream = UnixStream::connect_abstract(PATH, &cx)?;
+    let stream = UnixStream::connect_abstract(SOCKET_NAME, &cx)?;
 
     let cx = MainContext::default(|cx| cx.clone());
     let ex = Executor::new();

titanium-common/src/lib.rs

@@ -36,9 +36,12 @@ extern crate serde_derive;
 /// The mark that goes to the last position after a jump.
 pub const LAST_MARK: u8 = b'\'';
 
-// TODO: put in the home directory.
-/// The path to the unix domain socket.
-pub const PATH: &[u8] = b"titanium-server";
+/// The abstract name to the unix domain socket.
+#[cfg(not(debug_assertions))]
+pub const SOCKET_NAME: &[u8] = b"titanium-server";
+/// A different name is used in debug mode for easier debugging.
+#[cfg(debug_assertions)]
+pub const SOCKET_NAME: &[u8] = b"titanium-server-debug";
 
 #[doc(hidden)]
 pub type ExtensionId = u64;

titanium-web-extension/src/message_client.rs

@@ -38,7 +38,7 @@ use webkit2gtk_webextension::{
     WebPageExt,
 };
 
-use titanium_common::{ExtensionId, Message, PageId, PATH};
+use titanium_common::{ExtensionId, Message, PageId, SOCKET_NAME};
 use titanium_common::InnerMessage;
 use titanium_common::InnerMessage::*;
 
@@ -154,7 +154,7 @@ impl UpdateNew for MessageClient {
 impl MessageClient {
     pub fn new() -> nix::Result<EventStream<<Self as Update>::Msg>> {
         let cx = MainContext::default(|cx| cx.clone());
-        let stream = UnixStream::connect_abstract(PATH, &cx)?;
+        let stream = UnixStream::connect_abstract(SOCKET_NAME, &cx)?;
         Ok(execute::<MessageClient>(stream))
     }