Changeset 686
- Timestamp:
- 06/08/06 22:47:59 (3 years ago)
- Files:
-
- trunk/AUTHORS (modified) (1 diff)
- trunk/src/main.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/AUTHORS
r632 r686 13 13 Swiergot [swiergot(a)intersec,pl] [swiergot] 14 14 Przemyslaw Frasunek [venglin(a)freebsd,lublin,pl] [venglin] 15 Jaroslaw Kowalski [jaak(a)jkowalski,net] [jaak] trunk/src/main.c
r680 r686 31 31 #include <time.h> 32 32 #include <locale.h> 33 #include <time.h> 33 34 34 35 #ifdef HAVE_LANGINFO_CODESET … … 176 177 void log_handler_file(FILE *f,const gchar *log_domain, GLogLevelFlags log_level, 177 178 const gchar *message){ 178 179 struct tm localTime; 180 time_t now = time(0); 181 182 localtime_r(&now, &localTime); 183 fprintf(f,"%04d-%02d-%02d %02d:%02d:%02d ", 184 localTime.tm_year + 1900, 185 localTime.tm_mon + 1, 186 localTime.tm_mday, 187 localTime.tm_hour, 188 localTime.tm_min, 189 localTime.tm_sec 190 ); 179 191 if (log_domain && log_domain[0]) fprintf(f,"%s: ",log_domain); 180 192 switch(log_level){ … … 189 201 break; 190 202 case G_LOG_LEVEL_MESSAGE: 191 if (debug_level<-1) break;192 203 case G_LOG_LEVEL_INFO: 193 if (debug_level<0) break;194 204 fprintf(f,"%s\n",message); 195 205 break; 196 206 case G_LOG_LEVEL_DEBUG: 197 if (debug_level>0) 198 fprintf(f,_("Debug: %s\n"),message); 207 fprintf(f,_("Debug: %s\n"),message); 199 208 break; 200 209 default: … … 218 227 break; 219 228 case G_LOG_LEVEL_MESSAGE: 220 if (debug_level<-1) break;221 229 syslog(LOG_NOTICE,"%s",message); 222 230 break; 223 231 case G_LOG_LEVEL_INFO: 224 if (debug_level<0) break;225 232 syslog(LOG_NOTICE,"%s",message); 226 233 break; 227 234 case G_LOG_LEVEL_DEBUG: 228 if (debug_level>0) 229 syslog(LOG_DEBUG,_("Debug: %s\n"),message); 235 syslog(LOG_DEBUG,_("Debug: %s\n"),message); 230 236 break; 231 237 default: … … 264 270 void log_handler(const gchar *log_domain, GLogLevelFlags log_level, 265 271 const gchar *message, gpointer user_data){ 266 267 272 #ifdef ENABLE_NLS 268 273 char *lc_ctype,*lc_messages,*td_codeset; 269 274 #endif 275 276 switch(log_level){ 277 case G_LOG_LEVEL_MESSAGE: 278 if (debug_level<-1) return; 279 break; 280 case G_LOG_LEVEL_INFO: 281 if (debug_level<0) return; 282 break; 283 case G_LOG_LEVEL_DEBUG: 284 if (debug_level<=0) return; 285 break; 286 } 287 288 #ifdef ENABLE_NLS 270 289 td_codeset=g_strdup(bind_textdomain_codeset(PACKAGE,NULL)); 271 290 lc_ctype=g_strdup(setlocale(LC_CTYPE,NULL)); … … 280 299 281 300 log_level&=G_LOG_LEVEL_MASK; 301 282 302 if (foreground) log_handler_file(stderr,log_domain,log_level,message); 283 303 if (log_file) log_handler_file(log_file,log_domain,log_level,message);
