Changeset 16427

Timestamp:

05/21/08 23:45:35 (7 months ago)

Author:

piotras

Message:

Set and remove log handler so it's associated per request.

Files:

• branches/branch-1-9/midgard/apis/php5/midgard.c (modified) (9 diffs)

branches/branch-1-9/midgard/apis/php5/midgard.c

@@ -447 +447 @@
-        MidgardConnection *mgd = (MidgardConnection*) userdata;
-        gchar *level_ad = NULL;
-
+
+
+
-        
-        g_assert(msg != NULL);
@@ -502 +504 @@
-        }       
-
-
+ && mgd != NULL
-
-                midgard_error_default_log(
-                                domain, level, msg, MIDGARD_CONNECTION(mgd));
-        }
-
-        /*
-         if (mgd->loglevel >= level) {
-                
-                if (mgd->logfile == NULL) {     
-                        logfile = stderr;
-                } else {
-                        logfile = fopen(mgd->logfile, "a");
-                        if (logfile == NULL) {
-                                logfile = stderr;
-                                php_error(E_WARNING, 
-                                                "Could not open logfile '%s', using stderr", 
-                                                mgd->logfile);
-                        }                       
-                }
-                fno = fileno(logfile);          
-                if (fno != 2) flock(fno, LOCK_EX);              
-                fprintf(logfile, "%s ", domain != NULL ? domain : "midgard-core");
-                fprintf(logfile, "(pid:%ld):", (unsigned long)getpid());
-                fprintf(logfile, "(%s):", level_ad);
-                fprintf(logfile, "  %s\n", msg);
-                fflush(logfile);
-                if (fno != 2) flock(fno, LOCK_UN);
-                if (fno != 2) fclose(logfile);
-        }
-        */
-}
-
@@ -604 +580 @@
-
-        global_loghandler =
-G_LOG_DOMAIN
+"midgard-core"
-                                midgard_error_default_log, NULL); 
-        
@@ -734 +710 @@
-        REGISTER_LONG_CONSTANT("MGD_ERR_OBJECT_IMPORTED", MGD_ERR_OBJECT_IMPORTED, CONST_CS | CONST_PERSISTENT);
-        REGISTER_LONG_CONSTANT("MGD_ERR_MISSED_DEPENDENCE", MGD_ERR_MISSED_DEPENDENCE, CONST_CS | CONST_PERSISTENT);
+        
+        g_log_remove_handler("midgard-core", global_loghandler);
+        global_loghandler = 0;
-
-        return SUCCESS;
@@ -752 +731 @@
-{
-        g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+        
-        if (SG(server_context)) {
-                MGDG(rcfg) = mgd_php_bug_workaround_get_rcfg();
@@ -793 +773 @@
-                mgd_handle_singleton_set(mgd_handle()->_mgd);
-
-uint 
-G_LOG_DOMAIN
+lobal_
+"midgard-core"
-                                        G_LOG_LEVEL_MASK,
-                                        php_midgard_log_errors,
@@ -800 +780 @@
-
-                midgard_connection_set_loghandler(
-
-
-
+global_
+
+
-        /* Initialize closure hash */
-        php_midgard_gobject_closure_hash_new();
@@ -812 +792 @@
-PHP_RSHUTDOWN_FUNCTION(midgard)
-{
+        /* Remove midgard loghandler. This might be valid in web environment, 
+         * and might be not valid in cli. Midgard connection object might be 
+         * already unrefed here. */
+        if(global_loghandler)
+                g_log_remove_handler("midgard-core", global_loghandler);
+
+        /* FIXME, at least MidgardTypeHolder should be passed here instead of NULL */
+        global_loghandler =
+                g_log_set_handler("midgard-core",
+                                G_LOG_LEVEL_MASK,
+                                php_midgard_log_errors, NULL);
+
+        g_debug("MIDGARD REQUEST END");
+
-        midgard_request_config *rcfg = mgd_rcfg();
-        midgard *mgd = mgd_handle();
@@ -847 +841 @@
-        php_midgard_gobject_closure_hash_free();
-
-
+
+
+
-
-        return SUCCESS;