Changeset 991

Timestamp:

12/10/2006 23:14:16 (5 years ago)

Author:

chris

Message:

• Initialise Windows sockets automatically for all daemons on Win32
• Write PID files on Win32

File:

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

box/trunk/lib/server/Daemon.cpp

@@ -22 +22 @@
 #ifdef HAVE_SYSLOG_H
         #include <syslog.h>
+#endif
+
+#ifdef WIN32
+        #include <ws2tcpip.h>
 #endif
 
@@ -143 +147 @@
                                 fprintf(stderr, "%s: failed to start: "
                                         "failed to open configuration file: "
-                                        "%s", DaemonName(), 
+                                        "%s\n", DaemonName(), 
                                         mConfigFileName.c_str());
 #ifdef WIN32
@@ -190 +194 @@
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
+#endif // !WIN32
                 
                 // Server configuration
@@ -198 +203 @@
                 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"))
@@ -268 +274 @@
                 // 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)
                 {
@@ -281 +293 @@
                         THROW_EXCEPTION(ServerException, DaemoniseFailed)
                 }
-#endif
                 
                 // Set up memory leak reporting
@@ -353 +364 @@
                 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
@@ -382 +409 @@
                                                 errors.c_str());
                                         // And give up
-                                        return 1;
+                                        retcode = 1;
+                                        break;
                                 }
                                 
@@ -410 +438 @@
                         "(%d/%d)", DaemonName(), e.what(), e.GetType(), 
                         e.GetSubType());
-                return 1;
+                retcode = 1;
         }
         catch(std::exception &e)
@@ -416 +444 @@
                 ::syslog(LOG_ERR, "%s: terminating due to exception %s", 
                         DaemonName(), e.what());
-                return 1;
+                retcode = 1;
         }
         catch(...)
@@ -422 +450 @@
                 ::syslog(LOG_ERR, "%s: terminating due to unknown exception",
                         DaemonName());
-                return 1;
-        }
-        
-        return 0;
+                retcode = 1;
+        }
+
+#ifdef WIN32
+        WSACleanup();
+#endif
+        
+        return retcode;
 }