[myserver-commit] [SCM] GNU MyServer branch, master, updated. 6a4fdd086002dc0fdddc34b5e09a113bee216053

[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  6a4fdd086002dc0fdddc34b5e09a113bee216053 (commit)
      from  a175b9733e1c41bae691347f11773f35ffcc4865 (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 6a4fdd086002dc0fdddc34b5e09a113bee216053
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Sep 27 15:55:52 2009 +0200

    Surround the error message with the _ macro

diff --git a/myserver/src/base/process/process_server_manager.cpp 
b/myserver/src/base/process/process_server_manager.cpp
index 4ce9f32..0e56470 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -121,19 +121,14 @@ void ProcessServerManager::load ()
               if (portN)
                 addRemoteServer (domain.c_str(), name.c_str(), host.c_str(), 
portN);
               else
-                {
-                  ostringstream msg;
-                  msg << "Error: incomplete remote PROCESS_SERVER block, "
-                      << domain  << ":" << name << " needs a port";
-                  ::Server::getInstance ()->log (msg.str ().c_str (), 
MYSERVER_LOG_MSG_ERROR);
-                }
+                ::Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
+           _("Error: incomplete remote PROCESS_SERVER block, %s:%s needs a 
port"),
+                                                 domain, name);
             }
         }
       else
-        {
-          const char *msg = "Error: incomplete PROCESS_SERVER block";
-          ::Server::getInstance ()->log (msg, MYSERVER_LOG_MSG_ERROR);
-        }
+        ::Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
+                                   _("Error: incomplete PROCESS_SERVER 
block"));
     }
 
 }
@@ -354,10 +349,10 @@ void ProcessServerManager::removeDomain (const char* 
domain)
  *Count how many servers are present in a domain.
  *\param domain The server domain.
  */
-int ProcessServerManager::domainServers(const char* domain)
+int ProcessServerManager::domainServers (const char* domain)
 {
-  ServerDomain* serverDomain = getDomain(domain);
-  return serverDomain ? serverDomain->servers.size() : 0;
+  ServerDomain* serverDomain = getDomain (domain);
+  return serverDomain ? serverDomain->servers.size () : 0;
 }
 
 /*!
@@ -370,9 +365,9 @@ int ProcessServerManager::domainServers(const char* domain)
  *\param port Port to use for the server.
  */
 ProcessServerManager::Server*
-ProcessServerManager::runAndAddServer(const char *domain, const char *path,
-                                      const char *chroot, int uid, int gid,
-                                      u_short port)
+ProcessServerManager::runAndAddServer (const char *domain, const char *path,
+                                       const char *chroot, int uid, int gid,
+                                       u_short port)
 {
   Server* server = new Server;
 
@@ -405,15 +400,15 @@ int ProcessServerManager::runServer 
(ProcessServerManager::Server* server,
   server->host.assign("localhost");
   server->isLocal = true;
 
-  if(nServers >= maxServers)
-  {
-    ::Server::getInstance()->log(MYSERVER_LOG_MSG_ERROR,
+  if (nServers >= maxServers)
+    {
+      ::Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
                       _("Cannot run process %s: Reached max number of 
servers"),
                                  path);
-    return 1;
-  }
+      return 1;
+    }
 
-  if(port)
+  if (port)
     server->port = port;
   else
     server->port = 0;
@@ -422,31 +417,31 @@ int ProcessServerManager::runServer 
(ProcessServerManager::Server* server,
   string moreArg;
   int subString = path[0] == '"';
   int i;
-  int len = strlen(path);
+  int len = strlen (path);
 
-  for(i = 1; i < len; i++)
+  for (i = 1; i < len; i++)
     {
-      if(!subString && path[i] == ' ')
+      if (!subString && path[i] == ' ')
         break;
 
-      if(path[i] == '"' && path[i - 1] != '\\')
+      if (path[i] == '"' && path[i - 1] != '\\')
         subString = !subString;
     }
 
-  if(i < len)
+  if (i < len)
     {
       string tmpString(path);
       int begin = tmpString[0] == '"' ? 1 : 0;
       int end   = tmpString[i] == '"' ? i + 1 : i ;
-      tmpCgiPath.assign(tmpString.substr(begin, end));
-      moreArg.assign(tmpString.substr(i, len));
+      tmpCgiPath.assign (tmpString.substr (begin, end));
+      moreArg.assign (tmpString.substr(i, len));
     }
   else
     {
       int begin = (path[0] == '"') ? 1 : 0;
-      int end   = (path[len] == '"') ? len-1 : len;
-      tmpCgiPath.assign(&path[begin], end-begin);
-      moreArg.assign("");
+      int end   = (path[len] == '"') ? len - 1 : len;
+      tmpCgiPath.assign (&path[begin], end - begin);
+      moreArg.assign ("");
     }
 
   spi.envString = 0;

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

Summary of changes:
 .../src/base/process/process_server_manager.cpp    |   59 +++++++++-----------
 1 files changed, 27 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
GNU MyServer