From 9146443d09a9b99cc73a24f92e9fb15241292543 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 27 Oct 2023 18:03:49 +0600 Subject: [PATCH] csv fixes --- journals_list.csv | 1 + logging_services.csv | 3 ++- source/ubl-settings-logging.c | 13 +++++++------ ubl-settings-logging.glade | 15 ++++++++++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/journals_list.csv b/journals_list.csv index c939ad6..8d3533b 100644 --- a/journals_list.csv +++ b/journals_list.csv @@ -1,3 +1,4 @@ +Service_Name;Path_Log;Service_Description Acpid;/var/log/acpid;Журнал работы и обращений к Acpid Apache2;/var/log/apache2/error.log,/var/log/apache2/access.log;Журнал работы и обращений к веб-серверу Audit;/var/log/audit/audit.log;Журнал аудита (audit) diff --git a/logging_services.csv b/logging_services.csv index e9d43a8..74f8d0c 100644 --- a/logging_services.csv +++ b/logging_services.csv @@ -1,4 +1,5 @@ -journald;Системный журнал событий;systemctl start;systemctl start systemd-journald.service;systemctl stop systemd-journald.service;ubconfig set config SERVICESSTART+=systemd-journald.service;ubconfig set config SERVICESSTART-=systemd-journald.service;systemctl status systemd-journald.service +Service_Name;Service_Description;command_start;command_stop;command_enable;command_disable;command_status +journald;Системный журнал событий;systemctl start systemd-journald.service;systemctl stop systemd-journald.service;ubconfig set config SERVICESSTART+=systemd-journald.service;ubconfig set config SERVICESSTART-=systemd-journald.service;systemctl status systemd-journald.service logrotate;Служба ротации системных журналов событий;systemctl start logrotate.service;systemctl stop logrotate.service;ubconfig set config SERVICESSTART+=logrotate.service;ubconfig set config SERVICESSTART-=logrotate.service;systemctl status logrotate.service #metalog;Системный журнал событий;systemctl start metalog.service;systemctl stop metalog.service;ubconfig set config SERVICESSTART+=metalog.service;ubconfig set config SERVICESSTART-=metalog.service;systemctl status metalog.service #syslog-ng;Сервис сбора сообщений системных событий активных сетевых устройств;systemctl start syslog-ng.service;systemctl stop syslog-ng.service;ubconfig set config SERVICESSTART+=syslog-ng.service;ubconfig set config SERVICESSTART-=syslog-ng.service;systemctl status syslog-ng.service \ No newline at end of file diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index 46baf09..ae512d5 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -1525,7 +1525,7 @@ void on_start_stop_clicked(GtkButton *self, main_window *widgets){ char *start_command; char *stop_command; gboolean is_started; - gtk_tree_model_get(model,&iter,0,&is_started,5,&start_command,6,&stop_command,-1); + gtk_tree_model_get(model,&iter,0,&is_started,4,&start_command,5,&stop_command,-1); if (is_started){ yon_launch(stop_command); gtk_list_store_set(widgets->ServicesList,&iter,0,0,-1); @@ -1545,15 +1545,15 @@ void on_enable_disable_clicked(GtkButton *self, main_window *widgets){ char *start_command; char *stop_command; gboolean is_started; - gtk_tree_model_get(model,&iter,1,&is_started,7,&start_command,8,&stop_command,-1); + gtk_tree_model_get(model,&iter,1,&is_started,6,&start_command,7,&stop_command,-1); if (is_started){ yon_launch(stop_command); gtk_list_store_set(widgets->ServicesList,&iter,1,0,-1); - gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(self)),start_icon_name,GTK_ICON_SIZE_BUTTON); + gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(self)),enable_icon_name,GTK_ICON_SIZE_BUTTON); } else { yon_launch(start_command); gtk_list_store_set(widgets->ServicesList,&iter,1,1,-1); - gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(self)),stop_icon_name,GTK_ICON_SIZE_BUTTON); + gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(self)),disable_icon_name,GTK_ICON_SIZE_BUTTON); } } } @@ -1648,7 +1648,7 @@ main_window *setup_window(){ char *cparams=""; GtkTreeIter iter; config_str journals = yon_file_open(journals_list_path,&size); - for (int i=0;ilist,&iter,0,log[0],1,log[1],2,log[2],3,-1,4,-1,5,-1,6,-1,7,-1,-1); } config_str services = yon_file_open(services_list_path,&service_size); - for (int i=0;iServicesList,&iter); + // yon_config_load gtk_list_store_set(widgets->ServicesList,&iter,0,1,1,1,2,log[0],3,log[1],4,log[2],5,log[3],6,log[4],7,log[5],8,log[6],-1); } } diff --git a/ubl-settings-logging.glade b/ubl-settings-logging.glade index 4599617..98912f6 100644 --- a/ubl-settings-logging.glade +++ b/ubl-settings-logging.glade @@ -786,7 +786,7 @@ translated and supported by community. True fixed - 30 + 50 Log/Journal @@ -803,7 +803,8 @@ translated and supported by community. True fixed - 30 + 130 + 50 Path @@ -820,7 +821,7 @@ translated and supported by community. True fixed - 30 + 50 Description @@ -947,6 +948,8 @@ translated and supported by community. True fixed + 50 + 50 Status @@ -960,6 +963,8 @@ translated and supported by community. True fixed + 70 + 70 Autostart @@ -973,6 +978,8 @@ translated and supported by community. True fixed + 130 + 50 Service @@ -986,6 +993,8 @@ translated and supported by community. True fixed + 130 + 50 Description