From e9dcdd3bd281828543fa1ac6bd3dfa8f2c4fb569 Mon Sep 17 00:00:00 2001
From: kanoi <gitkanoi@k1k2.com>
Date: Tue, 23 Aug 2016 11:17:54 +1000
Subject: [PATCH] ckdb - use -N to change the listener socket name

---
 src/ckdb.c | 14 +++++++++++---
 src/ckdb.h |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/ckdb.c b/src/ckdb.c
index 59db2800..54e12ec3 100644
--- a/src/ckdb.c
+++ b/src/ckdb.c
@@ -807,6 +807,7 @@ K_TREE *userinfo_root;
 K_LIST *userinfo_free;
 K_STORE *userinfo_store;
 
+static char *listener_base = "listener";
 static char logname_db[512];
 static char logname_io[512];
 static char *dbcode;
@@ -8411,6 +8412,8 @@ static struct option long_options[] = {
 	{ "marker",		no_argument,		0,	'm' },
 	{ "markstart",		required_argument,	0,	'M' },
 	{ "name",		required_argument,	0,	'n' },
+	// base socket name to use instead of 'listener'
+	{ "listener",		required_argument,	0,	'N' },
 	{ "dbpass",		required_argument,	0,	'p' },
 	{ "btc-pass",		required_argument,	0,	'P' },
 	{ "reload-queue-limit",	required_argument,	0,	'q' },
@@ -8464,7 +8467,7 @@ int main(int argc, char **argv)
 	memset(&ckp, 0, sizeof(ckp));
 	ckp.loglevel = LOG_NOTICE;
 
-	while ((c = getopt_long(argc, argv, "a:b:B:c:d:D:f:ghi:IkK:l:L:mM:n:p:P:q:Q:r:R:s:S:t:Tu:U:vw:yY:", long_options, &i)) != -1) {
+	while ((c = getopt_long(argc, argv, "a:b:B:c:d:D:f:ghi:IkK:l:L:mM:n:N:p:P:q:Q:r:R:s:S:t:Tu:U:vw:yY:", long_options, &i)) != -1) {
 		switch(c) {
 			case '?':
 			case ':':
@@ -8611,6 +8614,9 @@ int main(int argc, char **argv)
 			case 'n':
 				ckp.name = strdup(optarg);
 				break;
+			case 'N':
+				listener_base = strdup(optarg);
+				break;
 			case 'p':
 				db_pass = strdup(optarg);
 				kill = optarg;
@@ -8860,7 +8866,9 @@ int main(int argc, char **argv)
 	}
 
 	if (key_update) {
-		ckp.main.sockname = strdup("klistener");
+		char buf[64];
+		snprintf(buf, sizeof(buf), "k%s", listener_base);
+		ckp.main.sockname = strdup(buf);
 		write_namepid(&ckp.main);
 		create_process_unixsock(&ckp.main);
 		fcntl(ckp.main.us.sockd, F_SETFD, FD_CLOEXEC);
@@ -8872,7 +8880,7 @@ int main(int argc, char **argv)
 		confirm_summaries();
 		everyone_die = true;
 	} else {
-		ckp.main.sockname = strdup("listener");
+		ckp.main.sockname = strdup(listener_base);
 		write_namepid(&ckp.main);
 		create_process_unixsock(&ckp.main);
 		fcntl(ckp.main.us.sockd, F_SETFD, FD_CLOEXEC);
diff --git a/src/ckdb.h b/src/ckdb.h
index 57768337..c67b02c9 100644
--- a/src/ckdb.h
+++ b/src/ckdb.h
@@ -58,7 +58,7 @@
 
 #define DB_VLOCK "1"
 #define DB_VERSION "1.0.7"
-#define CKDB_VERSION DB_VERSION"-2.417"
+#define CKDB_VERSION DB_VERSION"-2.418"
 
 #define WHERE_FFL " - from %s %s() line %d"
 #define WHERE_FFL_HERE __FILE__, __func__, __LINE__