File lxdm-0.2.0-logging.patch of Package lxdm

Overview Repositories Revisions Requests Users Attributes Meta

File lxdm-0.2.0-logging.patch of Package lxdm (Revision 6547107184c31f268d987032b739bdc2)

Currently displaying revision 6547107184c31f268d987032b739bdc2 , Show latest

diff -urN lxdm-0.2.0.orig/src/lxdm.c lxdm-0.2.0/src/lxdm.c
--- lxdm-0.2.0.orig/src/lxdm.c	2010-05-22 03:47:31.000000000 +0200
+++ lxdm-0.2.0/src/lxdm.c	2010-05-23 01:31:08.835981606 +0200
@@ -82,6 +82,8 @@
 #define SYSCONFIG_SESSION_KEY "DEFAULT_WM"
 #define SYSCONFIG_SESSION_FILE "/etc/sysconfig/windowmanager"
 
+#define LOGFILE "/var/log/lxdm.log"
+
 GKeyFile *config;
 static pid_t server;
 static guint server_watch;
@@ -235,16 +237,22 @@
     exit(0);
 }
 
-void log_print(char *fmt, ...)
+static void log_init(void)
+{
+    int fd_log;
+    g_unlink(LOGFILE ".old");
+    g_rename(LOGFILE, LOGFILE ".old");
+    g_unlink(LOGFILE);
+    fd_log = open(LOGFILE, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0640);
+    if(fd_log == -1) return;
+    dup2(fd_log, 1);
+    dup2(fd_log, 2);
+    close(fd_log);
+}
+
+static void log_ignore(const gchar *log_domain, GLogLevelFlags log_level,
+                       const gchar *message, gpointer user_data)
 {
-    FILE *log;
-    va_list ap;
-    log = fopen("/var/log/lxdm.log", "a");
-    if(!log) return;
-    va_start(ap, fmt);
-    vfprintf(log, fmt, ap);
-    va_end(ap);
-    fclose(log);
 }
 
 GSList *do_scan_xsessions(void)
@@ -523,7 +531,7 @@
     }
     err = pam_open_session(pamh, 0); /* FIXME pam session failed */
     if( err != PAM_SUCCESS )
-        log_print( "pam open session error \"%s\"\n", pam_strerror(pamh, err) );
+        g_warning( "pam open session error \"%s\"", pam_strerror(pamh, err) );
 }
 
 void close_pam_session(void)
@@ -544,7 +552,7 @@
 	if(!penv) return;
 	for(i=0;penv[i]!=NULL;i++)
 	{
-		//printf("PAM %s\n",penv[i]);
+		//g_debug("PAM %s",penv[i]);
 		n=strcspn(penv[i],"=")+1;
 		for(j=0;env[j]!=NULL;j++)
 		{
@@ -625,7 +633,7 @@
     fp = fopen(lockfile, "w");
     if( !fp )
     {
-        log_print("open lock file %s fail\n",lockfile);
+        g_warning("open lock file %s fail",lockfile);
         lxdm_quit_self(0);
     }
     fprintf( fp, "%d", getpid() );
@@ -674,7 +682,7 @@
 
 static void on_xserver_stop(GPid pid, gint status, gpointer data)
 {
-    //log_print("xserver stop, restart. return status %x\n",status);
+    //g_debug("xserver stop, restart. return status %x",status);
     stop_pid(server);
     server = -1;
     lxdm_restart_self();
@@ -728,18 +736,19 @@
     args = g_strsplit(arg, " ", -1);
     g_free(arg);
 
+    g_debug("starting X server");
     server = vfork();
 
     switch( server )
     {
     case 0:
         execvp(args[0], args);
-        log_print("exec %s fail\n",args[0]);
+        g_critical("exec %s fail",args[0]);
         lxdm_quit_self(0);
         break;
     case -1:
 	/* fatal error, should not restart self */
-        log_print("fork proc fail\n");
+        g_critical("fork proc fail");
         lxdm_quit_self(0);
         break;
     default:
@@ -832,7 +841,7 @@
         if( children[i] && !is_my_id(children[i]) )
             XKillClient(Dpy, children[i]);
 
-    //printf("kill %d\n",i);
+    //g_debug("kill %d",i);
     XFree( (char *)children );
     XSync(Dpy, 0);
     XSetErrorHandler(NULL);
@@ -849,7 +858,7 @@
 	if(!ut) return 0;
 	res=ut->ut_pid & 0xff;
 	endutent();
-	//log_print("runlevel %c\n",res);
+	//g_debug("runlevel %c",res);
 	return res;
 }
 
@@ -1134,20 +1143,21 @@
 {
 	void *array[40];
 	size_t size;
-	int fd;
-
-	fd=open("/var/log/lxdm.log",O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-	if(fd==-1) return;
+	char **bt_strs;
+	size_t i;
 
 	size=backtrace(array,40);
-	backtrace_symbols_fd(array,size,fd);
+	bt_strs=backtrace_symbols(array, size);
+
+	for (i=0; i<size; i++)
+	    fprintf(stderr, "%s\n", bt_strs[i]);
 
-	close(fd);
+	free(bt_strs);
 }
 
 static void sig_handler(int sig)
 {
-    log_print("catch signal %d\n", sig);
+    g_message("catch signal %d", sig);
     switch( sig )
     {
     case SIGTERM:
@@ -1191,7 +1201,7 @@
 
     if( getuid() != 0 )
     {
-        printf("only root is allowed to use this program\n");
+        fprintf(stderr, "only root is allowed to use this program\n");
         exit(EXIT_FAILURE);
     }
 
@@ -1202,10 +1212,15 @@
     }
 
     if( daemonmode )
+    {
         (void)daemon(1, 1);
+	log_init();
+    }
 
     self = arg[0];
 
+    /* turn of debug output */
+    g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, log_ignore, NULL);
     config = g_key_file_new();
     g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL);
 
diff -urN lxdm-0.2.0.orig/src/lxdm.h lxdm-0.2.0/src/lxdm.h
--- lxdm-0.2.0.orig/src/lxdm.h	2010-04-12 18:49:44.000000000 +0200
+++ lxdm-0.2.0/src/lxdm.h	2010-05-23 00:50:15.000000000 +0200
@@ -29,7 +29,6 @@
 
 extern GKeyFile *config;
 
-void log_print(char *fmt,...);
 int lxdm_auth_user(char *user,char *pass,struct passwd **ppw);
 void lxdm_do_login(struct passwd *pw,char *session,char *lang);
 void lxdm_do_reboot(void);
diff -urN lxdm-0.2.0.orig/src/ui.c lxdm-0.2.0/src/ui.c
--- lxdm-0.2.0.orig/src/ui.c	2010-04-12 18:49:44.000000000 +0200
+++ lxdm-0.2.0/src/ui.c	2010-05-22 04:35:35.000000000 +0200
@@ -420,7 +420,7 @@
     else if( !strncmp(str, "shutdown", 6) )
         lxdm_do_shutdown();
     else if( !strncmp(str, "log ", 4) )
-        log_print(str + 4);
+        g_message(str + 4);
     else if( !strncmp(str, "login ", 6) )
     {
         char *user = greeter_param(str, "user");

Places

File lxdm-0.2.0-logging.patch of Package lxdm (Revision 6547107184c31f268d987032b739bdc2)

Places