[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2935] Use the portable `endl' STL modifier to add new
|
From: |
Francesco Pipita |
|
Subject: |
[myserver-commit] [2935] Use the portable `endl' STL modifier to add new lines in the `log' method of the `LogManager'. |
|
Date: |
Mon, 03 Nov 2008 12:10:00 +0000 |
Revision: 2935
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2935
Author: francesco_pipita
Date: 2008-11-03 12:09:59 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Use the portable `endl' STL modifier to add new lines in the `log' method of
the `LogManager'. Renamed the `LoggingLevel' elements to avoid name conflicts
under Windows.
Modified Paths:
--------------
trunk/myserver/include/log/log_manager.h
trunk/myserver/include/server/server.h
trunk/myserver/src/base/process/process_server_manager.cpp
trunk/myserver/src/conf/vhost/vhost_manager.cpp
trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
trunk/myserver/src/connections_scheduler/listen_threads.cpp
trunk/myserver/src/log/log_manager.cpp
trunk/myserver/src/plugin/plugins_manager.cpp
trunk/myserver/src/protocol/http/http.cpp
trunk/myserver/src/server/clients_thread.cpp
trunk/myserver/src/server/server.cpp
trunk/myserver/tests/test_log_manager.cpp
Modified: trunk/myserver/include/log/log_manager.h
===================================================================
--- trunk/myserver/include/log/log_manager.h 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/include/log/log_manager.h 2008-11-03 12:09:59 UTC (rev
2935)
@@ -29,45 +29,27 @@
using namespace std;
-#ifdef WIN32
-#define NL "\r\n"
-#else
-#define NL "\n"
-#endif
-
-#ifdef INFO
-#undef INFO
-#endif
-
-#ifdef WARNING
-#undef WARNING
-#endif
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
enum LoggingLevel
{
- INFO,
- WARNING,
- ERROR
+ MYSERVER_LOG_INFO,
+ MYSERVER_LOG_WARNING,
+ MYSERVER_LOG_ERROR
};
class LogManager
{
public:
- LogManager (FiltersFactory* ff, LoggingLevel level = WARNING);
+ LogManager (FiltersFactory* ff, LoggingLevel level = MYSERVER_LOG_WARNING);
~LogManager ();
int add (void* owner, string type, string location,
list<string>& filters, u_long cycle);
int remove (void* owner);
int log (void* owner, string message, bool appendNL = false,
- LoggingLevel level = WARNING);
+ LoggingLevel level = MYSERVER_LOG_WARNING);
int log (void* owner, string type, string message, bool appendNL = false,
- LoggingLevel level = WARNING);
+ LoggingLevel level = MYSERVER_LOG_WARNING);
int log (void* owner, string type, string location, string message,
- bool appendNL = false, LoggingLevel level = WARNING);
+ bool appendNL = false, LoggingLevel level = MYSERVER_LOG_WARNING);
int close (void* owner);
int close (void* owner, string type);
int close (void* owner, string type, string location);
Modified: trunk/myserver/include/server/server.h
===================================================================
--- trunk/myserver/include/server/server.h 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/include/server/server.h 2008-11-03 12:09:59 UTC (rev
2935)
@@ -132,7 +132,7 @@
void stop();
void finalCleanup();
int terminate();
- int logWriteln(char const*, LoggingLevel level = WARNING);
+ int logWriteln(char const*, LoggingLevel level = MYSERVER_LOG_WARNING);
int logWriteln(string const &str)
{return logWriteln(str.c_str());};
int setLogLocation(string);
Modified: trunk/myserver/src/base/process/process_server_manager.cpp
===================================================================
--- trunk/myserver/src/base/process/process_server_manager.cpp 2008-11-02
22:29:54 UTC (rev 2934)
+++ trunk/myserver/src/base/process/process_server_manager.cpp 2008-11-03
12:09:59 UTC (rev 2935)
@@ -102,7 +102,7 @@
ostringstream msg;
msg << "Error: incomplete remote PROCESS_SERVER block, "
<< domain << ":" << name << " needs a port";
- ::Server::getInstance()->logWriteln(msg.str().c_str(), ERROR);
+ ::Server::getInstance()->logWriteln(msg.str().c_str(),
MYSERVER_LOG_ERROR);
}
}
@@ -110,7 +110,7 @@
else
{
const char *msg = "Error: incomplete PROCESS_SERVER block";
- ::Server::getInstance()->logWriteln(msg, ERROR);
+ ::Server::getInstance()->logWriteln(msg, MYSERVER_LOG_ERROR);
}
}
@@ -382,7 +382,7 @@
ostringstream stream;
stream << "Cannot run process " << path
<< ": Reached max number of servers";
- ::Server::getInstance()->logWriteln(stream.str().c_str(), ERROR);
+ ::Server::getInstance()->logWriteln(stream.str().c_str(),
MYSERVER_LOG_ERROR);
return 1;
}
Modified: trunk/myserver/src/conf/vhost/vhost_manager.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost_manager.cpp 2008-11-02 22:29:54 UTC
(rev 2934)
+++ trunk/myserver/src/conf/vhost/vhost_manager.cpp 2008-11-03 12:09:59 UTC
(rev 2935)
@@ -51,7 +51,7 @@
error.append(vh->getName());
error.append(", using HTTP by default");
vh->setProtocolName("http");
- Server::getInstance()->logWriteln(error.c_str(), ERROR);
+ Server::getInstance()->logWriteln(error.c_str(), MYSERVER_LOG_ERROR);
}
hostList.push_back(vh);
mutex.unlock();
@@ -210,14 +210,14 @@
if(err)
{
string str ("Error changing owner for accesses log locations");
- Server::getInstance()->logWriteln(str.c_str (), ERROR);
+ Server::getInstance()->logWriteln(str.c_str (),
MYSERVER_LOG_ERROR);
}
err = logManager->chown (vh, "WARNINGLOG", uid, gid);
if(err)
{
string str ("Error changing owner for errors log locations");
- Server::getInstance()->logWriteln(str.c_str (), ERROR);
+ Server::getInstance()->logWriteln(str.c_str (),
MYSERVER_LOG_ERROR);
}
}
}
@@ -334,7 +334,7 @@
}
if (err)
{
- Server::getInstance ()->logWriteln (str.c_str (), ERROR);
+ Server::getInstance ()->logWriteln (str.c_str (),
MYSERVER_LOG_ERROR);
}
}
}
@@ -358,7 +358,7 @@
{
errMsg.assign("Error opening: ");
errMsg.append(filename);
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(), MYSERVER_LOG_ERROR);
return -1;
}
doc = parser.getDoc();
@@ -376,7 +376,7 @@
parser.close();
clean();
errMsg.assign("Error: allocating memory");
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(),
MYSERVER_LOG_ERROR);
return -1;
}
@@ -470,7 +470,7 @@
{
errMsg.assign("Error: specified port greater than 65536 or
invalid: ");
errMsg.append((char*)lcur->children->content);
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(),
MYSERVER_LOG_ERROR);
}
vh->setPort((u_short)val);
}
@@ -562,7 +562,7 @@
if (vh->openLogFiles ())
{
errMsg.assign ("Error: opening log files");
- Server::getInstance ()->logWriteln (errMsg.c_str (), ERROR);
+ Server::getInstance ()->logWriteln (errMsg.c_str (),
MYSERVER_LOG_ERROR);
delete vh;
vh = 0;
continue;
@@ -571,7 +571,7 @@
if ( vh->initializeSSL() < 0 )
{
errMsg.assign("Error: initializing vhost");
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(),
MYSERVER_LOG_ERROR);
delete vh;
vh = 0;
continue;
@@ -580,7 +580,7 @@
if(addVHost(vh))
{
errMsg.assign("Error: adding vhost");
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(),
MYSERVER_LOG_ERROR);
delete vh;
vh = 0;
continue;
Modified: trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
2008-11-02 22:29:54 UTC (rev 2934)
+++ trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
2008-11-03 12:09:59 UTC (rev 2935)
@@ -357,7 +357,7 @@
{
if(server)
{
- server->logWriteln("Error initializing socket pair.", ERROR);
+ server->logWriteln("Error initializing socket pair.",
MYSERVER_LOG_ERROR);
}
return;
}
@@ -371,7 +371,7 @@
{
if(server)
{
- server->logWriteln("Error initializing dispatcher thread.", ERROR);
+ server->logWriteln("Error initializing dispatcher thread.",
MYSERVER_LOG_ERROR);
}
dispatchedThreadId = 0;
}
Modified: trunk/myserver/src/connections_scheduler/listen_threads.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/listen_threads.cpp 2008-11-02
22:29:54 UTC (rev 2934)
+++ trunk/myserver/src/connections_scheduler/listen_threads.cpp 2008-11-03
12:09:59 UTC (rev 2935)
@@ -96,7 +96,7 @@
serverSocketIPv4->socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (serverSocketIPv4->getHandle() == (FileHandle)INVALID_SOCKET)
{
- server->logWriteln(languageParser->getValue("ERR_OPENP"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_OPENP"),
MYSERVER_LOG_ERROR);
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
}
@@ -120,7 +120,7 @@
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr)) < 0)
{
- server->logWriteln(languageParser->getValue("ERR_ERROR"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_ERROR"),
MYSERVER_LOG_ERROR);
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
//return 0; allow IPv6
@@ -136,7 +136,7 @@
if (serverSocketIPv4->bind(&sockServerSocketIPv4,
sizeof(sockaddr_in)) != 0)
{
- server->logWriteln(languageParser->getValue("ERR_BIND"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_BIND"),
MYSERVER_LOG_ERROR);
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
}
@@ -155,7 +155,7 @@
serverSocketIPv6->socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
if ( serverSocketIPv6->getHandle() == (FileHandle)INVALID_SOCKET )
{
- server->logWriteln(languageParser->getValue("ERR_OPENP"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_OPENP"),
MYSERVER_ERROR);
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
}
@@ -177,7 +177,7 @@
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr))<0)
{
- server->logWriteln(languageParser->getValue("ERR_ERROR"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_ERROR"),
MYSERVER_ERROR);
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
//return 0;allow IPv6
@@ -187,7 +187,7 @@
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr)) < 0)
{
- server->logWriteln(languageParser->getValue("ERR_ERROR"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_ERROR"),
MYSERVER_ERROR);
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
//return 0;allow IPv6
@@ -203,7 +203,7 @@
if ( serverSocketIPv6->bind(&sockServerSocketIPv6,
sizeof(sockaddr_in6)) != 0)
{
- server->logWriteln(languageParser->getValue("ERR_BIND"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_BIND"),
MYSERVER_ERROR);
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
}
@@ -227,14 +227,14 @@
server->logWriteln(languageParser->getValue("MSG_SLISTEN"));
if (serverSocketIPv4 != NULL && serverSocketIPv4->listen(SOMAXCONN))
{
- server->logWriteln(languageParser->getValue("ERR_LISTEN"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_LISTEN"),
MYSERVER_LOG_ERROR);
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
}
if (serverSocketIPv6 != NULL && serverSocketIPv6->listen(SOMAXCONN))
{
- server->logWriteln(languageParser->getValue("ERR_LISTEN"), ERROR);
+ server->logWriteln(languageParser->getValue("ERR_LISTEN"),
MYSERVER_LOG_ERROR);
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
}
Modified: trunk/myserver/src/log/log_manager.cpp
===================================================================
--- trunk/myserver/src/log/log_manager.cpp 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/src/log/log_manager.cpp 2008-11-03 12:09:59 UTC (rev
2935)
@@ -230,9 +230,11 @@
success = 0;
if (appendNL)
{
- message.append (NL);
+ ostringstream oss;
+ oss << message << endl;
+ message.assign (oss.str ());
}
- if (level == ERROR)
+ if (level == MYSERVER_LOG_ERROR)
{
success =
notify (owner, EVT_ENTER_ERROR_MODE) ||
@@ -257,9 +259,11 @@
success = 0;
if (appendNL)
{
- message.append (NL);
+ ostringstream oss;
+ oss << message << endl;
+ message.assign (oss.str ());
}
- if (level == ERROR)
+ if (level == MYSERVER_LOG_ERROR)
{
success =
notify (owner, type, EVT_ENTER_ERROR_MODE) ||
@@ -283,9 +287,11 @@
{
if (appendNL)
{
- message.append (NL);
+ ostringstream oss;
+ oss << message << endl;
+ message.assign (oss.str ());
}
- if (level == ERROR)
+ if (level == MYSERVER_LOG_ERROR)
{
success =
notify (owner, type, location, EVT_ENTER_ERROR_MODE) ||
Modified: trunk/myserver/src/plugin/plugins_manager.cpp
===================================================================
--- trunk/myserver/src/plugin/plugins_manager.cpp 2008-11-02 22:29:54 UTC
(rev 2934)
+++ trunk/myserver/src/plugin/plugins_manager.cpp 2008-11-03 12:09:59 UTC
(rev 2935)
@@ -100,7 +100,7 @@
{
string error;
error.assign("Warning: invalid plugin name in PLUGIN block");
- server->logWriteln(error.c_str(), ERROR);
+ server->logWriteln(error.c_str(), MYSERVER_LOG_ERROR);
ret = -1;
}
else
@@ -355,4 +355,4 @@
PluginsManager::PluginOption* PluginsManager::getPluginOption(string& plugin)
{
return pluginsOptions.get(plugin);
-}
\ No newline at end of file
+}
Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/src/protocol/http/http.cpp 2008-11-03 12:09:59 UTC (rev
2935)
@@ -1183,7 +1183,7 @@
errMsg.assign("Invalid virtual host requested from ");
errMsg.append(a->getIpAddr());
- Server::getInstance()->logWriteln(errMsg.c_str(), ERROR);
+ Server::getInstance()->logWriteln(errMsg.c_str(),
MYSERVER_LOG_ERROR);
raiseHTTPError(400);
/*!
Modified: trunk/myserver/src/server/clients_thread.cpp
===================================================================
--- trunk/myserver/src/server/clients_thread.cpp 2008-11-02 22:29:54 UTC
(rev 2934)
+++ trunk/myserver/src/server/clients_thread.cpp 2008-11-03 12:09:59 UTC
(rev 2935)
@@ -208,14 +208,14 @@
ostringstream s;
s << "Bad alloc: " << ba.what();
- ct->server->logWriteln(s.str().c_str(), ERROR);
+ ct->server->logWriteln(s.str().c_str(), MYSERVER_LOG_ERROR);
}
catch( exception &e)
{
ostringstream s;
s << "Error: " << e.what();
- ct->server->logWriteln(s.str().c_str(), ERROR);
+ ct->server->logWriteln(s.str().c_str(), MYSERVER_LOG_ERROR);
};
}
Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/src/server/server.cpp 2008-11-03 12:09:59 UTC (rev
2935)
@@ -164,7 +164,7 @@
if (copyConfigurationFromDefault("myserver.xml"))
{
- logWriteln("Error loading configuration file\n", ERROR);
+ logWriteln("Error loading configuration file", MYSERVER_LOG_ERROR);
return -1;
}
}
@@ -175,7 +175,7 @@
if (copyConfigurationFromDefault("MIMEtypes.xml"))
{
- logWriteln(languageParser.getValue("ERR_LOADMIME"), ERROR);
+ logWriteln(languageParser.getValue("ERR_LOADMIME"), MYSERVER_LOG_ERROR);
return -1;
}
}
@@ -186,7 +186,7 @@
if (copyConfigurationFromDefault("virtualhosts.xml") != 0)
{
- logWriteln(languageParser.getValue("ERR_LOADVHOSTS"), ERROR);
+ logWriteln(languageParser.getValue("ERR_LOADVHOSTS"),
MYSERVER_LOG_ERROR);
return -1;
}
}
@@ -243,7 +243,7 @@
if(startupSocketLib(MAKEWORD( 1, 1)) != 0)
{
- logWriteln( languageParser.getValue ("MSG_SERVER_CONF"), ERROR);
+ logWriteln( languageParser.getValue ("MSG_SERVER_CONF"),
MYSERVER_LOG_ERROR);
return 1;
}
@@ -422,7 +422,7 @@
string msg;
msg.assign(languageParser.getValue("ERR_ERROR"));
msg.append(" : Reading IP list");
- logWriteln(msg.c_str(), ERROR);
+ logWriteln(msg.c_str(), MYSERVER_LOG_ERROR);
return -1;
}
else
@@ -449,7 +449,7 @@
}
else
{
- logWriteln(languageParser.getValue("ERR_LOADMIME"), ERROR);
+ logWriteln(languageParser.getValue("ERR_LOADMIME"), MYSERVER_LOG_ERROR);
}
nCPU << (u_int)getCPUCount();
@@ -515,7 +515,7 @@
{
ostringstream stream;
stream << languageParser.getValue("ERR_ERROR") << ": Gzip Filter";
- logWriteln(stream.str().c_str(), ERROR);
+ logWriteln(stream.str().c_str(), MYSERVER_LOG_ERROR);
}
Protocol *protocolsSet[] = {new HttpProtocol(),
@@ -1042,7 +1042,7 @@
{
string err;
err.assign("Error loading: ");
- logWriteln(err.c_str(), ERROR);
+ logWriteln(err.c_str(), MYSERVER_LOG_ERROR);
return -1;
}
logWriteln(languageParser.getValue("MSG_LANGUAGE"));
@@ -1666,13 +1666,13 @@
{
out << languageParser.getValue("ERR_ERROR")
<< ": setAdditionalGroups";
- logWriteln(out.str().c_str(), ERROR);
+ logWriteln(out.str().c_str(), MYSERVER_LOG_ERROR);
}
if(Process::setgid(gid))
{
out << languageParser.getValue("ERR_ERROR") << ": setgid " << gid;
- logWriteln(out.str().c_str(), ERROR);
+ logWriteln(out.str().c_str(), MYSERVER_LOG_ERROR);
}
autoRebootEnabled = false;
}
@@ -1688,7 +1688,7 @@
if(Process::setuid(uid))
{
out << languageParser.getValue("ERR_ERROR") << ": setuid " << uid;
- logWriteln(out.str().c_str(), ERROR);
+ logWriteln(out.str().c_str(), MYSERVER_LOG_ERROR);
}
autoRebootEnabled = false;
}
@@ -1925,7 +1925,7 @@
delete newThread;
str.assign(languageParser.getValue("ERR_ERROR"));
str.append(": Threads creation" );
- logWriteln(str.c_str(), ERROR);
+ logWriteln(str.c_str(), MYSERVER_LOG_ERROR);
return -1;
}
Modified: trunk/myserver/tests/test_log_manager.cpp
===================================================================
--- trunk/myserver/tests/test_log_manager.cpp 2008-11-02 22:29:54 UTC (rev
2934)
+++ trunk/myserver/tests/test_log_manager.cpp 2008-11-03 12:09:59 UTC (rev
2935)
@@ -149,11 +149,11 @@
{
list<string> filters;
lm->add (this, "test", "file://foo", filters, 0);
- CPPUNIT_ASSERT (lm->log (this, "test", "a message", false, INFO));
- CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false, ERROR));
- CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false, WARNING));
- lm->setLevel (INFO);
- CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false, INFO));
+ CPPUNIT_ASSERT (lm->log (this, "test", "a message", false,
MYSERVER_LOG_INFO));
+ CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false,
MYSERVER_LOG_ERROR));
+ CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false,
MYSERVER_LOG_WARNING));
+ lm->setLevel (MYSERVER_LOG_INFO);
+ CPPUNIT_ASSERT (!lm->log (this, "test", "a message", false,
MYSERVER_LOG_INFO));
}
void testClear ()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2935] Use the portable `endl' STL modifier to add new lines in the `log' method of the `LogManager'.,
Francesco Pipita <=