Applications
/
ubl-settings-logging
7
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

First version of table journald overview is done

Browse Source
pull/62/head
Ivan Yartsev 2 years ago
parent c3b63593e7
commit 667c7b5c18
3 changed files with 122 additions and 88 deletions
Show Stats Download Patch File Download Diff File

89
source/ubl-settings-logging.c
Unescape View File

@ -267,13 +267,34 @@ void on_inspector_jornald_read_async(inspector_window *window){
} }
char output[4092]; char output[4092];
GtkTreeIter iter; GtkTreeIter iter;
// while (1){ main_config.remove_thread=0;
// if(fgets(output,4092,fl)){ while (main_config.remove_thread==0){
// gtk_list_store_append(window->list, &iter); if(fgets(output,4092,fl)){
if(strcmp(output,"")){
gtk_list_store_append(window->list, &iter);
// gtk_list_store_set(window->list,&iter,0,&); char *identifier="";
// } char *temp = yon_char_new(output);
// } char *log=temp;
if (strstr(log,"\033[H\033[2J\033[3"))
yon_char_divide(log,strlen("\033[H\033[2J\033[3"));
log = yon_char_divide_search(log,"\n",-1);
if (window->last_mode<5){
identifier = log;
log=strstr(log,":")+1;
log=strstr(log,":")+1;
log=strstr(log,":")+1;
char *iden = yon_char_new(identifier);
identifier=yon_char_divide(iden,strlen(identifier)-strlen(log)-1);
free(iden);
}
gtk_list_store_set(window->list,&iter,0,identifier,1,log,-1);
free(temp);
}
}
// g_usleep(100);
}
} }
void on_inspector_update(GtkWidget *self, inspector_window *window){ void on_inspector_update(GtkWidget *self, inspector_window *window){
@ -282,64 +303,42 @@ void on_inspector_update(GtkWidget *self, inspector_window *window){
config_str output; config_str output;
if (!strcmp(window->journal_name,"journald")){ if (!strcmp(window->journal_name,"journald")){
GtkWidget *terminal = (GtkWidget*)window->terminals->first->data; GtkWidget *terminal = (GtkWidget*)window->terminals->first->data;
if (self==window->UpdateButton){ gtk_widget_hide(window->LoggingNotebook);
switch(window->last_mode){ gtk_widget_show(gtk_widget_get_parent(window->JournaldTree));
case 0:
yon_terminal_integrated_start(terminal, get_journal_output_command,NULL,NULL);
break;
case 1:
yon_terminal_integrated_start(terminal, get_journal_output_since_boot_command,NULL,NULL);
break;
case 2:
yon_terminal_integrated_start(terminal, get_journal_output_followed_command,NULL,NULL);
break;
case 3:
yon_terminal_integrated_start(terminal, get_journal_output_kernel_command,NULL,NULL);
break;
case 4:
yon_terminal_integrated_start(terminal, get_journal_output_prioritied_command,NULL,NULL);
break;
case 5:
yon_terminal_integrated_start(terminal, get_journal_all_boots_command,NULL,NULL);
break;
case 6:
yon_terminal_integrated_start(terminal, get_journal_all_units_command,NULL,NULL);
break;
case 7:
yon_terminal_integrated_start(terminal, get_journal_init_tree_command,NULL,NULL);
break;
}
}
if (self==window->ShowSinceBootButton){ if (self==window->ShowSinceBootButton){
window->last_mode=1; window->last_mode=1;
yon_terminal_integrated_start(terminal, get_journal_output_since_boot_command,NULL,NULL);
} }
if (self==window->NewMessagesButton){ if (self==window->NewMessagesButton){
window->last_mode=2; window->last_mode=2;
yon_terminal_integrated_start(terminal, get_journal_output_followed_command,NULL,NULL);
} }
if (self==window->ShowKernelButton){ if (self==window->ShowKernelButton){
window->last_mode=3; window->last_mode=3;
yon_terminal_integrated_start(terminal, get_journal_output_kernel_command,NULL,NULL);
} }
if (self==window->ShowPriorityButton){ if (self==window->ShowPriorityButton){
window->last_mode=4; window->last_mode=4;
yon_terminal_integrated_start(terminal, get_journal_output_prioritied_command,NULL,NULL);
} }
if (self==window->ShowAllBootsButton){ if (self==window->ShowAllBootsButton){
window->last_mode=5; window->last_mode=5;
yon_terminal_integrated_start(terminal, get_journal_all_boots_command,NULL,NULL);
} }
if (self==window->ShowAllUnitsButton){ if (self==window->ShowAllUnitsButton){
window->last_mode=6; window->last_mode=6;
yon_terminal_integrated_start(terminal, get_journal_all_units_command,NULL,NULL);
} }
if (self==window->ShowInitTreeButton){ if (self==window->ShowInitTreeButton){
window->last_mode=7; window->last_mode=7;
yon_terminal_integrated_start(terminal, get_journal_init_tree_command,NULL,NULL);
} }
main_config.remove_thread++;
gtk_tree_view_set_model(GTK_TREE_VIEW(window->JournaldTree),GTK_TREE_MODEL(window->list));
gtk_list_store_clear(window->list);
gtk_tree_view_set_model(GTK_TREE_VIEW(window->JournaldTree),GTK_TREE_MODEL(window->list));
if (main_config.inspector_thread){
main_config.remove_thread=1;
pthread_join(main_config.inspector_thread,NULL);
}
pthread_create(&main_config.inspector_thread, NULL, (void *)on_inspector_jornald_read_async, window);
} else { } else {
if (window->terminals){ if (window->terminals){
gtk_widget_hide(gtk_widget_get_parent(window->JournaldTree));
gtk_widget_show(window->LoggingNotebook);
dictionary *dict=NULL; dictionary *dict=NULL;
for_dictionaries (dict,window->terminals){ for_dictionaries (dict,window->terminals){
GtkWidget *terminal = (GtkWidget*)dict->data; GtkWidget *terminal = (GtkWidget*)dict->data;
@ -381,6 +380,10 @@ GtkWidget *yon_inspector_add_terminal(inspector_window *window,char *page_name,i
} }
void on_inspector_close(GtkWidget *self){
main_config.remove_thread++;
}
void on_inspector_open(GtkWidget *self, main_window *widgets){ void on_inspector_open(GtkWidget *self, main_window *widgets){
inspector_window *window = malloc(sizeof(inspector_window)); inspector_window *window = malloc(sizeof(inspector_window));
GtkBuilder *builder = gtk_builder_new_from_resource(glade_inspector_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_inspector_path);
@ -395,6 +398,8 @@ void on_inspector_open(GtkWidget *self, main_window *widgets){
window->LoggingNotebook=yon_gtk_builder_get_widget(builder,"MainNotebook"); window->LoggingNotebook=yon_gtk_builder_get_widget(builder,"MainNotebook");
window->UpdateButton=yon_gtk_builder_get_widget(builder,"UpdateButton"); window->UpdateButton=yon_gtk_builder_get_widget(builder,"UpdateButton");
window->JournalActionsBox=yon_gtk_builder_get_widget(builder,"JournalActionsBox"); window->JournalActionsBox=yon_gtk_builder_get_widget(builder,"JournalActionsBox");
window->JournaldTree=yon_gtk_builder_get_widget(builder,"JournaldTree");
window->list=GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1"));
yon_window_config_custom_window_setup(GTK_WINDOW(window->MainWindow),"InspectorWindow"); yon_window_config_custom_window_setup(GTK_WINDOW(window->MainWindow),"InspectorWindow");
gtk_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL); gtk_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL);
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window));
@ -402,6 +407,7 @@ void on_inspector_open(GtkWidget *self, main_window *widgets){
GtkTreeIter iter; GtkTreeIter iter;
char *name; char *name;
char *paths; char *paths;
g_signal_connect(G_OBJECT(window->MainWindow),"destroy", G_CALLBACK(on_inspector_close),window);
g_signal_connect(G_OBJECT(window->UpdateButton),"clicked", G_CALLBACK(on_inspector_update),window); g_signal_connect(G_OBJECT(window->UpdateButton),"clicked", G_CALLBACK(on_inspector_update),window);
g_signal_connect(G_OBJECT(window->ShowKernelButton),"clicked", G_CALLBACK(on_inspector_update),window); g_signal_connect(G_OBJECT(window->ShowKernelButton),"clicked", G_CALLBACK(on_inspector_update),window);
g_signal_connect(G_OBJECT(window->NewMessagesButton),"clicked", G_CALLBACK(on_inspector_update),window); g_signal_connect(G_OBJECT(window->NewMessagesButton),"clicked", G_CALLBACK(on_inspector_update),window);
@ -2262,6 +2268,7 @@ void config_init(){
main_config.lock_save_local=0; main_config.lock_save_local=0;
main_config.logrotate_list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_STRING); main_config.logrotate_list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_STRING);
main_config.logrotate_apps_list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_STRING); main_config.logrotate_apps_list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_STRING);
main_config.remove_thread=-1;
PolkitSubject *subject = NULL; PolkitSubject *subject = NULL;

53
source/ubl-settings-logging.h
Unescape View File

@ -49,14 +49,14 @@
#define JOURNALD(key) yon_char_unite("JOURNALD[",key,"]",NULL) #define JOURNALD(key) yon_char_unite("JOURNALD[",key,"]",NULL)
#define LOGROTATE(key) yon_char_unite("LOGROTATE[",key,"]",NULL) #define LOGROTATE(key) yon_char_unite("LOGROTATE[",key,"]",NULL)
#define get_journal_output_command "clear;journalctl --no-pager" #define get_journal_output_command "clear;SYSTEMD_COLORS=false journalctl --no-pager"
#define get_journal_output_since_boot_command "clear;journalctl --no-pager -b" #define get_journal_output_since_boot_command "clear;SYSTEMD_COLORS=false journalctl --no-pager -b"
#define get_journal_output_followed_command "clear;journalctl --no-pager -f" #define get_journal_output_followed_command "clear;SYSTEMD_COLORS=false journalctl --no-pager -f"
#define get_journal_output_kernel_command "clear;journalctl --no-pager -k" #define get_journal_output_kernel_command "clear;SYSTEMD_COLORS=false journalctl --no-pager -k"
#define get_journal_output_prioritied_command "clear;journalctl --no-pager -p err..alert" #define get_journal_output_prioritied_command "clear;SYSTEMD_COLORS=false journalctl --no-pager -p err..alert"
#define get_journal_all_boots_command "clear;journalctl --list-boots" #define get_journal_all_boots_command "clear;SYSTEMD_COLORS=false journalctl --no-pager --list-boots"
#define get_journal_all_units_command "clear;systemd-analyze blame --no-pager" #define get_journal_all_units_command "clear;SYSTEMD_COLORS=false systemd-analyze blame --no-pager"
#define get_journal_init_tree_command "clear;systemd-analyze critical-chain" #define get_journal_init_tree_command "clear;SYSTEMD_COLORS=false systemd-analyze critical-chain --no-pager"
#define group_list_path "/etc/group" #define group_list_path "/etc/group"
@ -99,6 +99,9 @@ typedef struct {
config_str *saved_logs; config_str *saved_logs;
GPermission *permissions; GPermission *permissions;
pthread_t inspector_thread;
int remove_thread;
} config; } config;
typedef struct { typedef struct {
@ -188,22 +191,24 @@ typedef struct {
} add_log_window; } add_log_window;
typedef struct { typedef struct {
GtkWidget *MainWindow; GtkWidget *MainWindow;
GtkWidget *plugBox; GtkWidget *plugBox;
GtkWidget *ShowSinceBootButton; GtkWidget *ShowSinceBootButton;
GtkWidget *NewMessagesButton; GtkWidget *NewMessagesButton;
GtkWidget *ShowKernelButton; GtkWidget *ShowKernelButton;
GtkWidget *ShowPriorityButton; GtkWidget *ShowPriorityButton;
GtkWidget *UpdateButton; GtkWidget *UpdateButton;
GtkWidget *ShowAllBootsButton; GtkWidget *ShowAllBootsButton;
GtkWidget *ShowAllUnitsButton; GtkWidget *ShowAllUnitsButton;
GtkWidget *ShowInitTreeButton; GtkWidget *ShowInitTreeButton;
GtkWidget *LoggingNotebook; GtkWidget *LoggingNotebook;
GtkWidget *JournalActionsBox; GtkWidget *JournalActionsBox;
dictionary *terminals; GtkListStore *list;
int last_mode; GtkWidget *JournaldTree;
char *journal_name; dictionary *terminals;
int journal_size; int last_mode;
char *journal_name;
int journal_size;
config_str journal_paths; config_str journal_paths;
} inspector_window; } inspector_window;

34
ubl-settings-logging-inspector.glade
Unescape View File

@ -53,11 +53,19 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-logging.generic7-symbolic</property> <property name="icon-name">com.ublinux.ubl-settings-logging.generic7-symbolic</property>
</object> </object>
<object class="GtkListStore" id="liststore1"/> <object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gchararray2 -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow" id="MainWindow"> <object class="GtkWindow" id="MainWindow">
<property name="width-request">800</property> <property name="width-request">800</property>
<property name="height-request">600</property> <property name="height-request">600</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="modal">True</property>
<property name="default-width">800</property> <property name="default-width">800</property>
<property name="default-height">600</property> <property name="default-height">600</property>
<property name="icon-name">com.ublinux.ubl-settings-logging</property> <property name="icon-name">com.ublinux.ubl-settings-logging</property>
@ -248,20 +256,28 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkScrolledWindow">
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<child> <child>
<object class="GtkTreeView" id="JournaldTree"> <object class="GtkTreeView" id="JournaldTree">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="model">liststore1</property> <property name="model">liststore1</property>
<property name="headers-visible">False</property> <property name="headers-visible">False</property>
<child internal-child="selection"> <property name="enable-grid-lines">both</property>
<object class="GtkTreeSelection"/> <property name="tooltip-column">0</property>
</child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="sizing">fixed</property>
<property name="fixed-width">175</property>
<property name="min-width">75</property>
<property name="title" translatable="yes">column</property> <property name="title" translatable="yes">column</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText">
<property name="ellipsize">end</property>
</object>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
@ -271,8 +287,12 @@
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">column</property> <property name="title" translatable="yes">column</property>
<property name="expand">True</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText">
<property name="wrap-mode">word</property>
<property name="wrap-width">500</property>
</object>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
@ -280,6 +300,8 @@
</object> </object>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>

Write Preview
Loading…
Cancel
Save