main: separate loading of config and setup_logging at startup
This is the first part of a fix for bug #74 (making reloading of config work if running as non-privileged user) Michael
This commit is contained in:
		
							parent
							
								
									f923649a11
								
							
						
					
					
						commit
						2235a97f05
					
				@ -386,7 +386,14 @@ main (int argc, char **argv)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        log_message (LOG_INFO, "Initializing " PACKAGE " ...");
 | 
					        log_message (LOG_INFO, "Initializing " PACKAGE " ...");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        ret = reload_config ();
 | 
					        ret = reload_config_file (config_defaults.config_file,
 | 
				
			||||||
 | 
					                                  &config,
 | 
				
			||||||
 | 
					                                  &config_defaults);
 | 
				
			||||||
 | 
					        if (ret != 0) {
 | 
				
			||||||
 | 
					                exit (EX_SOFTWARE);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ret = setup_logging ();
 | 
				
			||||||
        if (ret != 0) {
 | 
					        if (ret != 0) {
 | 
				
			||||||
                exit (EX_SOFTWARE);
 | 
					                exit (EX_SOFTWARE);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user