[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-313-g9e16baf

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  9e16baf8d3f45c1c5e6954682a330096008f982b (commit)
      from  f2cc3fe15fe22d01e088daf136c596a4ac0470ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9e16baf8d3f45c1c5e6954682a330096008f982b
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Nov 9 17:50:04 2012 -0500

    - 3528056 sfcbd --version doesn't always work

-----------------------------------------------------------------------

Summary of changes:
diff --git a/NEWS b/NEWS
index 196e9df..2be16c1 100644
--- a/NEWS
+++ b/NEWS
@@ -121,6 +121,7 @@ Bugs fixed:
 - 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
 =================
diff --git a/sfcBroker.c b/sfcBroker.c
index 6ad35ab..73c4847 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -612,14 +612,9 @@ main(int argc, char *argv[])
   long            dSockets,
                   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)
@@ -663,8 +658,7 @@ main(int argc, char *argv[])
       break;
 
     case 'd':
-      daemon(0, 0);
-      currentProc = sfcBrokerPid = getpid();    /* req. on some systems */
+      daemonize=1;
       break;
 
     case 'h':
@@ -727,6 +721,18 @@ main(int argc, char *argv[])
     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",


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker