[myserver-commit] [2955] Don' t add a LogStream to the LogManager if a bad filter list was provided.

[Francesco Pipita]

Revision: 2955
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2955
Author:   francesco_pipita
Date:     2008-11-10 10:29:47 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
Don't add a LogStream to the LogManager if a bad filter list was provided.

Modified Paths:
--------------
    trunk/myserver/src/log/log_manager.cpp
    trunk/myserver/src/log/stream/console_stream_creator.cpp
    trunk/myserver/src/log/stream/file_stream_creator.cpp
    trunk/myserver/src/log/stream/socket_stream_creator.cpp
    trunk/myserver/tests/test_log_manager.cpp

Modified: trunk/myserver/src/log/log_manager.cpp
===================================================================
--- trunk/myserver/src/log/log_manager.cpp      2008-11-10 10:27:08 UTC (rev 
2954)
+++ trunk/myserver/src/log/log_manager.cpp      2008-11-10 10:29:47 UTC (rev 
2955)
@@ -44,7 +44,11 @@
 {
   ostringstream oss;
   oss << endl;
-  newline.assign (oss.str ());
+  if (newline.assign (oss.str ()).size ())
+    {
+      return 0;
+    }
+  return 1;
 }
 
 int

Modified: trunk/myserver/src/log/stream/console_stream_creator.cpp
===================================================================
--- trunk/myserver/src/log/stream/console_stream_creator.cpp    2008-11-10 
10:27:08 UTC (rev 2954)
+++ trunk/myserver/src/log/stream/console_stream_creator.cpp    2008-11-10 
10:29:47 UTC (rev 2955)
@@ -26,7 +26,10 @@
     {
       u_long nbw;
       FiltersChain* fc = ff->chain (filters, out, &nbw);
-      return new ConsoleStream (ff, cycle, out, fc);
+      if (fc)
+        {
+          return new ConsoleStream (ff, cycle, out, fc);
+        }
     }
   if (out)
     {

Modified: trunk/myserver/src/log/stream/file_stream_creator.cpp
===================================================================
--- trunk/myserver/src/log/stream/file_stream_creator.cpp       2008-11-10 
10:27:08 UTC (rev 2954)
+++ trunk/myserver/src/log/stream/file_stream_creator.cpp       2008-11-10 
10:29:47 UTC (rev 2955)
@@ -27,7 +27,10 @@
     {
       u_long nbw;
       FiltersChain* fc = ff->chain (filters, out, &nbw);
-      return new FileStream (ff, cycle, out, fc);
+      if (fc)
+        {
+          return new FileStream (ff, cycle, out, fc);
+        }
     }
   if (out)
     {

Modified: trunk/myserver/src/log/stream/socket_stream_creator.cpp
===================================================================
--- trunk/myserver/src/log/stream/socket_stream_creator.cpp     2008-11-10 
10:27:08 UTC (rev 2954)
+++ trunk/myserver/src/log/stream/socket_stream_creator.cpp     2008-11-10 
10:29:47 UTC (rev 2955)
@@ -28,7 +28,10 @@
     {
       u_long nbw;
       FiltersChain* fc = ff->chain (filters, out, &nbw);
-      return new SocketStream (ff, cycle, out, fc);
+      if (fc)
+        {
+          return new SocketStream (ff, cycle, out, fc);
+        }
     }
   if (out)
     {

Modified: trunk/myserver/tests/test_log_manager.cpp
===================================================================
--- trunk/myserver/tests/test_log_manager.cpp   2008-11-10 10:27:08 UTC (rev 
2954)
+++ trunk/myserver/tests/test_log_manager.cpp   2008-11-10 10:29:47 UTC (rev 
2955)
@@ -48,6 +48,7 @@
   CPPUNIT_TEST (testCount);
   CPPUNIT_TEST (testGet);
   CPPUNIT_TEST (testReOpen);
+  CPPUNIT_TEST (testAddWithNotExistingFilter);
   CPPUNIT_TEST_SUITE_END ();
 public:
   void setUp ()
@@ -286,15 +287,12 @@
     string message2;
     char buf[128];
     u_long nbr;
+    ostringstream oss;
 
-#ifdef WIN32
-    message1.assign ("message1\r\n");
-    message2.assign ("message2\r\n");
-#endif
-#ifdef NOT_WIN
-    message1.assign ("message1\n");
-    message2.assign ("message2\n");
-#endif
+    oss << "message1" << endl;
+    message1.assign (oss.str ());
+    oss << "message2" << endl;
+    message2.assign (oss.str ());
 
     lm->add (this, "test", "file://foo", filters, 0);
     lm->log (this, "test", "file://foo", message1);
@@ -309,6 +307,16 @@
     CPPUNIT_ASSERT (!string (buf).compare (message1.append (message2)));
   }
 
+  void testAddWithNotExistingFilter ()
+  {
+    list<string> filters;
+
+    filters.push_back ("not_existing_filter");
+    CPPUNIT_ASSERT (lm->add (this, "test", "file://foo", filters, 0));
+    CPPUNIT_ASSERT (lm->add (this, "test", "socket://127.0.0.1:6666", filters, 
0));
+    CPPUNIT_ASSERT (lm->add (this, "test", "console://stdout", filters, 0));
+  }
+
   void tearDown ()
   {
     delete lm;