[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-273-g8b41684

[Giuseppe Scrivano]

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 "GNU MyServer".

The branch, master has been updated
       via  8b416844de280703dd1e583efdab9633ae038afe (commit)
      from  1d031d5204a745aa28f34784aeeffccbe28f974c (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 8b416844de280703dd1e583efdab9633ae038afe
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Aug 4 23:25:06 2010 +0200

    Print the configuration files used.

diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 0896eb0..312a80e 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -204,7 +204,8 @@ void Server::start (string &mainConf, string &mimeConf, 
string &vhostConf,
         return;
       }
 
-    log (MYSERVER_LOG_MSG_INFO, _("Loading server configuration..."));
+    log (MYSERVER_LOG_MSG_INFO, _("Loading server configuration from %s..."),
+         mainConf.c_str ());
 
     if (postLoad ())
       {
@@ -305,7 +306,8 @@ int Server::postLoad ()
     return -1;
 
   /* Load the MIME types.  */
-  log (MYSERVER_LOG_MSG_INFO, _("Loading MIME types..."));
+  log (MYSERVER_LOG_MSG_INFO, _("Loading MIME types from %s..."),
+       mimeConfigurationFile.c_str ());
 
   string handlerStr (getData ("server.mime_handler", "xml"));
   mimeManager.setDefaultHandler (handlerStr);
@@ -366,6 +368,9 @@ int Server::loadVHostConf ()
                                        vhostConfigurationFile.c_str ());
 
   /* Load the virtual hosts configuration.  */
+  log (MYSERVER_LOG_MSG_INFO, _("Loading virtual hosts from %s..."),
+       vhostLocation);
+
   if (vhostHandler->load (vhostLocation))
     {
       log (MYSERVER_LOG_MSG_ERROR,

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

Summary of changes:
 myserver/src/server/server.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer