Fixed journald configuration loading

pull/62/head
parent 718c53320d
commit 3a50336886

@ -143,7 +143,7 @@ void update_loaded_logrotate(){
} }
int yon_load_proceed(YON_CONFIG_TYPE type){ int yon_load_proceed(YON_CONFIG_TYPE type){
if (yon_config_load_register(type,"logging",LOGROTATE("*"),JOURNALD("*"),NULL)){ if (yon_config_load_register(type,"logging",LOGROTATE("*"),"logging",JOURNALD("*"),NULL)){
update_loaded_logrotate(); update_loaded_logrotate();
return 1; return 1;
} }
@ -1439,7 +1439,6 @@ void on_journald_save(GtkWidget *self, journald_window *window){
TTY = (char*)gtk_entry_get_text(GTK_ENTRY(window->RedirectTTYEntry)); TTY = (char*)gtk_entry_get_text(GTK_ENTRY(window->RedirectTTYEntry));
if (yon_char_is_empty(TTY)) if (yon_char_is_empty(TTY))
consoleforwardactive=0; consoleforwardactive=0;
else
} }
else if (consoleforwardactive == 2){ else if (consoleforwardactive == 2){
confor = "no"; confor = "no";
@ -1459,11 +1458,13 @@ void on_journald_save(GtkWidget *self, journald_window *window){
yon_config_register(JOURNALD("SplitMode"),"logging",splitmode); yon_config_register(JOURNALD("SplitMode"),"logging",splitmode);
else else
yon_config_remove_by_key(JOURNALD("SplitMode")); yon_config_remove_by_key(JOURNALD("SplitMode"));
if (consoleforwardactive != 0) if (consoleforwardactive != 0){
yon_config_register(JOURNALD("ForwardToConsole"),"logging",confor); yon_config_register(JOURNALD("ForwardToConsole"),"logging",confor);
yon_config_register(JOURNALD("TTYPath"),"logging",TTY); yon_config_register(JOURNALD("TTYPath"),"logging",TTY);
else } else {
yon_config_remove_by_key(JOURNALD("ForwardToConsole")); yon_config_remove_by_key(JOURNALD("ForwardToConsole"));
yon_config_register(JOURNALD("TTYPath"),"logging",TTY);
}
if (forwardempty!=0) if (forwardempty!=0)
yon_config_register(JOURNALD("MaxLevelConsole"),"logging",yon_char_from_int(forwardempty-1)); yon_config_register(JOURNALD("MaxLevelConsole"),"logging",yon_char_from_int(forwardempty-1));
else else

Loading…
Cancel
Save