From 9cccb8c1159b0a4747b5152e2df08e42207b574d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 21:19:46 +0000
Subject: Make the log stuff a bit tidier with some helper functions.

---
 server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index e17b9356..e9159422 100644
--- a/server.c
+++ b/server.c
@@ -173,7 +173,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	}
 	close(pair[0]);
 
-	if (debug_level > 3)
+	if (log_get_level() > 3)
 		tty_create_log();
 	if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
 	    "tty ps", NULL) != 0)
-- 
cgit 


From 1e2df2d46496fc025330c25fa08e83d14e62d11b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 21:52:06 +0000
Subject: Remove the -I part of show-messages which isn't really that useful;
 the server start time can now be accessed with a new start_time format (use:
 tmux display -p '#{t:start_time}')

---
 server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index e9159422..d950ed77 100644
--- a/server.c
+++ b/server.c
@@ -187,7 +187,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	mode_key_init_trees();
 	key_bindings_init();
 
-	start_time = time(NULL);
+	gettimeofday(&start_time, NULL);
 
 	server_fd = server_create_socket();
 	if (server_fd == -1)
-- 
cgit 


From dca93c56e05ce631dd2f80da759f40c4d4b20ab5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 23:01:51 +0000
Subject: Do lock failures slightly better, return a special value so we don't
 unlink the wrong thing.

---
 server.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index d950ed77..c45e8a2c 100644
--- a/server.c
+++ b/server.c
@@ -195,9 +195,11 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	server_update_socket();
 	server_client_create(pair[1]);
 
-	unlink(lockfile);
-	free(lockfile);
-	close(lockfd);
+	if (lockfd >= 0) {
+		unlink(lockfile);
+		free(lockfile);
+		close(lockfd);
+	}
 
 	start_cfg();
 
-- 
cgit