CHANGED more fprintf(stderr, ...) to LOG(ERROR)

ADDED redirection of python sys.stderr to LOG(ERROR)

src/base/logging.cc

@@ -29,6 +29,14 @@
 
 #include <string>
 
+namespace base
+{
+    void stderr_to_log::write (const char *msg)
+    {
+        LOG(ERROR) << msg;
+    }
+}
+
 namespace google
 {
     int log_level = 3;

src/base/logging.h

@@ -28,6 +28,26 @@
 #ifndef LOGGING_H_
 #define LOGGING_H_
 
+namespace base
+{
+    /*
+     * Redirect Python stderr to our own logging
+     * implementation. For this to work, an instance
+     * of this class has to be assigned to sys.stderr.
+     */
+    class stderr_to_log
+    {
+    public:
+        /*
+         * Redirect message to log, using level ERROR.
+         * @param msg the message to append to the log.
+         */
+        void write (const char *msg);
+    };
+}
+
+#ifndef SWIG
+
 #include <iostream>  // provide std::endl
 #include <string>
 #include <cstdlib>
@@ -122,3 +142,4 @@ namespace logging
 } // namespace{}
 
 #endif
+#endif

src/py-wrappers/adonthell/py_base.i

@@ -170,6 +170,7 @@ namespace base {
 typedef long time_t;
 %include "base/savegame.h"
 %include "base/serializer.h"
+%include "base/logging.h"
 
 %template(py_serializer) base::serializer<PyObject>;
 

src/python/python.cc

@@ -1,6 +1,4 @@
 /*
-   $Id: python.cc,v 1.15 2009/04/16 21:06:09 ksterker Exp $
-
    Copyright (C) 2003/2004 Alexandre Courbot <alexandrecourbot@linuxgames.com>
    Part of the Adonthell Project http://adonthell.linuxgames.com
 
@@ -48,7 +46,6 @@ namespace python
             // PyErr_Print will clear the error state, so it must
             // be called after the checks above.
             PyErr_Print ();
-            fflush (stderr);
         }
     }
 
@@ -57,6 +54,9 @@ namespace python
     {
         Py_Initialize ();
         pool::init ();
+
+        // make sure that PyErr_Print uses our own logging
+        run_simple_string("import sys; from adonthell.base import stderr_to_log; sys.stderr = stderr_to_log();");
     }
 
     // shutdown python interpreter
@@ -117,7 +117,7 @@ namespace python
         // make sure the given arguments are a tuple
         if (tuple && !PyTuple_Check (tuple))
         {
-            fprintf (stderr, "*** error: python::pad_tuple: argument must be a tuple!\n");
+            LOG(ERROR) << "python::pad_tuple: argument must be a tuple!";
             return NULL;
         }
 
@@ -174,8 +174,9 @@ namespace python
                 }
                 default:
                 {
-                    fprintf (stderr, "*** python::get_tuple: unsupported type: %s!\n", 
-                             base::flat::name_for_type ((base::flat::data_type) type));
+                    LOG(ERROR) << "python::get_tuple: unsupported type: "
+                               << base::flat::name_for_type ((base::flat::data_type) type)
+                               << "!";
                     break;
                 }
             }
@@ -210,7 +211,7 @@ namespace python
             else
             {
                 PyObject *repr = PyObject_Repr (item);
-                fprintf (stderr, "*** python::put_tuple: cannot save '%s'!\n", PyString_AsString (repr));
+                LOG(ERROR) << "python::put_tuple: cannot save '" << PyString_AsString (repr) << "'!";
                 Py_DECREF (repr);
             }
         }

src/python/script.cc

@@ -137,7 +137,7 @@ PyObject* script::call_method_ret (const string &name, PyObject *args) const
         }
         else
         {
-            fprintf (stderr, "*** script::call_method_ret: '%s' is not callable!\n", name.c_str ());
+            LOG(ERROR) << "script::call_method_ret: '" << name << "' is not callable!";
         }
     }