Changeset 16383

Timestamp:

05/15/08 15:57:25 (5 months ago)

Author:

piotras

Message:

Try to workaround log handler triggered segfaults

Files:

• branches/branch-1-8/src/apis/php4/midgard.c (modified) (6 diffs)

branches/branch-1-8/src/apis/php4/midgard.c

@@ -1794 +1794 @@
-#endif /* PHP_MAJOR_VERSION == 5 */
-
+guint midgard_core_loghandler;
+
-PHP_MINIT_FUNCTION(midgard)
-{
@@ -1819 +1821 @@
-                        mgd_log_debug_default,
-                        (gpointer)holder);
-
+
+
-                        mgd_log_debug_default,
-                        (gpointer)holder);
@@ -1943 +1946 @@
-        
-        return SUCCESS;
+
+        g_log_remove_handler("midgard-core", midgard_core_loghandler);
-}
-
@@ -1975 +1980 @@
-        if (MGDG(dcfg)) {       
-                MGDG(mgd)->loglevel = MGDG(dcfg)->loglevel;
+                
-                MGDG(mgd)->logfile = g_strdup(MGDG(dcfg)->logfile);
-        }
@@ -1988 +1994 @@
-                g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
-                MGDG(mgd)->loghandler =  
-G_LOG_DOMAIN
+"midgard-core"
-                                        MGDG(mgd)->loglevel,
-                                        php_midgard_log_errors, 
@@ -2026 +2032 @@
-                        mgd->person = NULL;
-                }
+
+                g_log_remove_handler("midgard-core",  MGDG(mgd)->loghandler);
-        }
-