Commit 78ee74cf authored by Karl Heyes's avatar Karl Heyes

change thread startup/shutdown order slightly wrt to slave thread

svn path=/trunk/icecast/; revision=5791
parent c9d6c049
...@@ -103,8 +103,8 @@ static void _shutdown_subsystems(void) ...@@ -103,8 +103,8 @@ static void _shutdown_subsystems(void)
fserve_shutdown(); fserve_shutdown();
xslt_shutdown(); xslt_shutdown();
refbuf_shutdown(); refbuf_shutdown();
stats_shutdown();
slave_shutdown(); slave_shutdown();
stats_shutdown();
/* Now that these are done, we can stop the loggers. */ /* Now that these are done, we can stop the loggers. */
_stop_logging(); _stop_logging();
...@@ -439,8 +439,6 @@ int main(int argc, char **argv) ...@@ -439,8 +439,6 @@ int main(int argc, char **argv)
fclose (f); fclose (f);
} }
} }
/* Do this after logging init */
slave_initialize();
INFO0("icecast server started"); INFO0("icecast server started");
...@@ -454,6 +452,9 @@ int main(int argc, char **argv) ...@@ -454,6 +452,9 @@ int main(int argc, char **argv)
yp_initialize(); yp_initialize();
#endif #endif
/* Do this after logging init */
slave_initialize();
_server_proc(); _server_proc();
INFO0("Shutting down"); INFO0("Shutting down");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment