modified switch.c to not create PID file until all modules are loaded

this help init scripts to check when everything is really loaded.
Also return 1 when loading modules fails, do not return 255 which can
be confused with a segmentation fault or some other more violent code

diff --git a/src/switch.c b/src/switch.c
index f5ffe950e236e78da3b3961b726af21418e3ceb3..5b71b64e8d0595c34492b628107f0693997061e0 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -894,6 +894,11 @@ int main(int argc, char *argv[])
 
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.run_dir, SWITCH_DEFAULT_DIR_PERMS, pool);
 
+       if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
+               fprintf(stderr, "Failed to initialize modules: %s\n", err);
+               return 1;
+       }
+
        if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, pool) == SWITCH_STATUS_SUCCESS) {
 
                old_pid_len = sizeof(old_pid_buffer);
@@ -920,14 +925,6 @@ int main(int argc, char *argv[])
 
        switch_file_write(fd, pid_buffer, &pid_len);
 
-       if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
-               fprintf(stderr, "Cannot Initialize [%s], deleting pid file [%s]\n", err, pid_path);
-               if (unlink(pid_path) != 0) {
-                       fprintf(stderr, "Failed to delete pid file [%s]\n", pid_path);
-               }
-               return 255;
-       }
-
 #ifndef WIN32
        if (do_wait) {
                kill(getppid(), SIGUSR2);