[Opengate-svn] SF.net SVN: opengate: [797] trunk

[<eg...@us...>]

Revision: 797
          http://opengate.svn.sourceforge.net/opengate/?rev=797&view=rev
Author:   egore
Date:     2007-09-26 13:28:50 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
2007-09-26  Christoph Brill  <eg...@us...>
	* src/metaserver.cpp: beautify the log and indent the ifdefs

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/metaserver.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/ChangeLog	2007-09-26 20:28:50 UTC (rev 797)
@@ -1,3 +1,6 @@
+2007-09-26  Christoph Brill  <eg...@us...>
+	* src/metaserver.cpp: beautify the log and indent the ifdefs
+
 2007-09-24  Christoph Brill  <eg...@us...>
 	* src/common.cpp, src/common.h: add method to split strings with a
 	given delimiter

Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp	2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/src/metaserver.cpp	2007-09-26 20:28:50 UTC (rev 797)
@@ -57,6 +57,7 @@
 }
 
 MetaConnection::~MetaConnection() {
+  log_->info ( "Shutting down metaserver connection " );
   // asio doesn't need a cleanup, right?
 }
 
@@ -230,7 +231,7 @@
 	  if (returncode > 0) {
 	    return returncode;
 	  } else {
-	    log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+	    log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
 	    return -4;
 	  }
       }
@@ -357,13 +358,12 @@
 
   // Read the response status line.
 #ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
-  #else
+  // we dont have boost:regex within win32, i will fix this later (carsten)
+  //asio::read_until(socket_, response, "\n");
+#else
     asio::read_until(socket_, response, boost::regex("\r\n"));
-   #endif
+#endif
 
-
   // Check that response is OK.
   std::istream response_stream(&response);
   std::string http_version;
@@ -382,12 +382,12 @@
   }
 
   // Read the response headers, which are terminated by a blank line.
- #ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
-  #else
+#ifdef WIN32
+  // we dont have boost:regex within win32, i will fix this later (carsten)
+  //asio::read_until(socket_, response, "\n");
+#else
   asio::read_until(socket_, response, boost::regex("\r\n\r\n"));
-  #endif
+#endif
 
   // Process the response headers. (to get the crap of the response before reading the body!)
   std::string header;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.