Changeset 897

Timestamp:

31/08/2006 23:51:29 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/server/Daemon.cpp (modified) (11 diffs)

box/chris/merge/lib/server/Daemon.cpp

@@ -22 +22 @@
 #ifdef HAVE_SYSLOG_H
         #include <syslog.h>
-#endif
-
-#ifdef WIN32
-        #include <ws2tcpip.h>
 #endif
 
@@ -147 +143 @@
                                 fprintf(stderr, "%s: failed to start: "
                                         "failed to open configuration file: "
-                                        "%s\n", DaemonName(), 
+                                        "%s", DaemonName(), 
                                         mConfigFileName.c_str());
 #ifdef WIN32
@@ -194 +190 @@
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
-#endif // !WIN32
                 
                 // Server configuration
@@ -203 +198 @@
                 pidFileName = serverConfig.GetKeyValue("PidFile");
                 FileHandleGuard<(O_WRONLY | O_CREAT | O_TRUNC), (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)> pidFile(pidFileName.c_str());
-        
-#ifndef WIN32   
+                
                 // Handle changing to a different user
                 if(serverConfig.KeyExists("User"))
@@ -274 +268 @@
                 // open the log
                 ::openlog(DaemonName(), LOG_PID, LOG_LOCAL6);
-
                 // Log the start message
                 ::syslog(LOG_INFO, "Starting daemon (config: %s) (version " 
                         BOX_VERSION ")", mConfigFileName.c_str());
 
+#ifndef WIN32
                 // Write PID to file
                 char pid[32];
-
-#ifdef WIN32
-                int pidsize = sprintf(pid, "%d", (int)GetCurrentProcessId());
-#else
                 int pidsize = sprintf(pid, "%d", (int)getpid());
-#endif
-
                 if(::write(pidFile, pid, pidsize) != pidsize)
                 {
@@ -293 +281 @@
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
+#endif
                 
                 // Set up memory leak reporting
@@ -364 +353 @@
                 return 1;
         }
-
-#ifdef WIN32
-        // Under win32 we must initialise the Winsock library
-        // before using sockets
-
-        WSADATA info;
-
-        if (WSAStartup(0x0101, &info) == SOCKET_ERROR)
-        {
-                // will not run without sockets
-                ::syslog(LOG_ERR, "Failed to initialise Windows Sockets");
-                THROW_EXCEPTION(CommonException, Internal)
-        }
-#endif
-
-        int retcode = 0;
         
         // Main Daemon running
@@ -409 +382 @@
                                                 errors.c_str());
                                         // And give up
-                                        retcode = 1;
-                                        break;
+                                        return 1;
                                 }
                                 
@@ -438 +410 @@
                         "(%d/%d)", DaemonName(), e.what(), e.GetType(), 
                         e.GetSubType());
-                retcode = 1;
+                return 1;
         }
         catch(std::exception &e)
@@ -444 +416 @@
                 ::syslog(LOG_ERR, "%s: terminating due to exception %s", 
                         DaemonName(), e.what());
-                retcode = 1;
+                return 1;
         }
         catch(...)
@@ -450 +422 @@
                 ::syslog(LOG_ERR, "%s: terminating due to unknown exception",
                         DaemonName());
-                retcode = 1;
-        }
-
-#ifdef WIN32
-        WSACleanup();
-#endif
-        
-        return retcode;
+                return 1;
+        }
+        
+        return 0;
 }