Lazy connect for socketmap.

Author: edgarpettijohn

table_socketmap.c

@@ -34,10 +34,12 @@
 #include "log.h"
 #include "table_stdio.h"
 
+#define	REPLYBUFFERSIZE	100000
+
 static char	       *config;
 static int		sock = -1;
+static int		connected = 0;
 static FILE	       *sockstream;
-#define	REPLYBUFFERSIZE	100000
 static char		repbuffer[REPLYBUFFERSIZE+1];
 
 enum socketmap_reply{
@@ -76,6 +78,8 @@ table_socketmap_connect(const char *s)
 		goto err;
 	}
 
+	connected = 1;
+
 	return 1;
 
 err:
@@ -94,6 +98,13 @@ table_socketmap_query(const char *name, const char *key)
 	ssize_t	len;
 	int	ret = SM_PERM;
 
+	if (!connected) {
+		if (!table_socketmap_connect(config)) {
+			log_warnx("error connecting to %s", config);
+			return ret;
+		}
+	}
+
 	memset(repbuffer, 0, sizeof repbuffer);
 	fprintf(sockstream, "%s %s\n", name, key);
 	fflush(sockstream);
@@ -224,9 +235,6 @@ main(int argc, char **argv)
 
 	config = argv[0];
 
-	if (table_socketmap_connect(config) == 0)
-		fatalx("error connecting to %s", config);
-
 	table_api_on_update(table_socketmap_update);
 	table_api_on_check(table_socketmap_check);
 	table_api_on_lookup(table_socketmap_lookup);