[Sblim-commit] sfcb ChangeLog, 1.807, 1.808 NEWS, 1.722, 1.723 sfcBroker.c, 1.65, 1.66

[Michael Chase-S. <mc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv11509

Modified Files:
	ChangeLog NEWS sfcBroker.c 
Log Message:
- 3528056 sfcbd --version doesn't always work


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -d -r1.722 -r1.723
--- NEWS	8 Nov 2012 00:32:12 -0000	1.722
+++ NEWS	9 Nov 2012 22:22:41 -0000	1.723
@@ -23,6 +23,7 @@
 - 3582062 Various additional error checking
 - 3580137 Classname needed in *ActivateFilter
 - 3585274 Local connect kills tracing
+- 3528056 sfcbd --version doesn't always work
 
 Changes in 1.3.15
 =================

Index: sfcBroker.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- sfcBroker.c	13 Sep 2012 20:32:53 -0000	1.65
+++ sfcBroker.c	9 Nov 2012 22:22:41 -0000	1.66
@@ -576,14 +576,9 @@
    int syslogLevel=LOG_ERR;
    long dSockets,sSockets,pSockets;
    char *pauseStr;
+   int daemonize=0;
 
    sfcbUseSyslog=1;
-   /* SF 3462309 - If there is an instance running already, return */
-   int pid_found = 0;
-   if ((pid_found = sfcb_is_running()) != 0) {
-      mlogf(M_ERROR, M_SHOW, " --- A previous instance of sfcbd [%d] is running. Exiting.\n", pid_found);
-      exit(1);
-   }
 
    name = strrchr(argv[0], '/');
    if (name != NULL) ++name;
@@ -627,8 +622,7 @@
 	       break;
 
 	   case 'd':
-	       daemon(0, 0);
-	       currentProc=sfcBrokerPid=getpid(); /* req. on some systems */
+           daemonize=1;
 	       break;
 
 	   case 'h':
@@ -688,6 +682,18 @@
       usage(1);
    }
 
+   /* SF 3462309 - If there is an instance running already, return */
+   int pid_found = 0;
+   if ((pid_found = sfcb_is_running()) != 0) {
+      mlogf(M_ERROR, M_SHOW, " --- A previous instance of sfcbd [%d] is running. Exiting.\n", pid_found);
+      exit(1);
+   }
+
+   if (daemonize){
+    daemon(0, 0);
+    currentProc=sfcBrokerPid=getpid(); /* req. on some systems */
+   }
+
    startLogging(syslogLevel,1);
 
    mlogf(M_INFO,M_SHOW,"--- %s V" sfcHttpDaemonVersion " started - %d\n", name, currentProc);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -d -r1.807 -r1.808
--- ChangeLog	8 Nov 2012 00:32:12 -0000	1.807
+++ ChangeLog	9 Nov 2012 22:22:41 -0000	1.808
@@ -1,3 +1,8 @@
+2012-11-09 Michael Chase-Salerno <br...@li...>
+
+	* sfcBroker.c:
+	[ 3528056 ] sfcbd --version doesn't always work
+
 2012-11-07 Michael Chase-Salerno <br...@li...>
 
 	* trace.c: