svk/rac-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлена новая опция при работе с кластером --kill-by-memory-with-dump. Добавлен механизм перевода заголовков таблиц и списков. Исправлены некоторые названия

Browse Source
This commit is contained in:
Sergey 2019-09-02 18:33:47 +03:00
parent b199afb492
commit bd839a9e66
3 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/function.tcl
View File

@ -90,11 +90,29 @@ proc InsertItemsWorkList {lst} {
.frm_work.tree_work insert {} end -values $value_list -tags $tag .frm_work.tree_work insert {} end -values $value_list -tags $tag
.frm_work.tree_work column #0 -stretch .frm_work.tree_work column #0 -stretch
foreach j $column_list { foreach j $column_list {
.frm_work.tree_work heading $j -text $j .frm_work.tree_work heading $j -text [::msgcat::mc [HumanReadableTextConvert $j]]
} }
incr work_list_row_count incr work_list_row_count
} }
# Преобразование выражений (названий параметров) полученных из консоли
# для отображания в графических элементах.
# Т.е. выражение "session-fault-tolerance-level"
# будет преобразовано в "Session fault tolerance level"
proc HumanReadableTextConvert {txt} {
set lst [split $txt "-"]
if {[llength $lst] >0} {
foreach item $lst {
append str " " $item
}
}
set str [string trim $str]
set first_letter [string range $str 0 0]
set str "[string toupper $first_letter][string range $str 1 end]"
return $str
}
proc RunCommand {par} { proc RunCommand {par} {
global dir rac_cmd cluster work_list_row_count \ global dir rac_cmd cluster work_list_row_count \
agent_user agent_pwd cluster_user cluster_pwd server_platform agent_user agent_pwd cluster_user cluster_pwd server_platform
@ -1140,7 +1158,7 @@ proc Add::infobases {tree host values} {
proc Add::cluster {tree host values} { proc Add::cluster {tree host values} {
global default lifetime_limit expiration_timeout session_fault_tolerance_level global default lifetime_limit expiration_timeout session_fault_tolerance_level
global max_memory_size max_memory_time_limit errors_count_threshold security_level global max_memory_size max_memory_time_limit errors_count_threshold security_level
global load_balancing_mode kill_problem_processes \ global load_balancing_mode kill_problem_processes kill_by_memory_with_dump \
agent_user agent_pwd cluster_user cluster_pwd auth_agent agent_user agent_pwd cluster_user cluster_pwd auth_agent
if {$agent_user ne "" && $agent_pwd ne ""} { if {$agent_user ne "" && $agent_pwd ne ""} {
set auth_agent "--agent-user=$agent_user --agent-pwd=$agent_pwd" set auth_agent "--agent-user=$agent_user --agent-pwd=$agent_pwd"
@ -1159,7 +1177,7 @@ proc Add::cluster {tree host values} {
set frm [AddToplevel [::msgcat::mc "Cluster"] cluster_grey_64] set frm [AddToplevel [::msgcat::mc "Cluster"] cluster_grey_64]
ttk::label $frm.lbl_host -text [::msgcat::mc "Main server address"] ttk::label $frm.lbl_host -text [::msgcat::mc "Host"]
ttk::entry $frm.ent_host ttk::entry $frm.ent_host
ttk::label $frm.lbl_port -text [::msgcat::mc "Port"] ttk::label $frm.lbl_port -text [::msgcat::mc "Port"]
ttk::entry $frm.ent_port ttk::entry $frm.ent_port
@ -1167,27 +1185,34 @@ proc Add::cluster {tree host values} {
ttk::label $frm.lbl_name -text [::msgcat::mc "Name"] ttk::label $frm.lbl_name -text [::msgcat::mc "Name"]
ttk::entry $frm.ent_name ttk::entry $frm.ent_name
ttk::label $frm.lbl_secure_connect -text [::msgcat::mc "Secure level"] ttk::label $frm.lbl_security_level -text [::msgcat::mc "Security level"]
ttk::combobox $frm.cb_security_level -textvariable security_level -values $default(security_level) ttk::combobox $frm.cb_security_level -textvariable security_level -values $default(security_level)
ttk::label $frm.lbl_expiration_timeout -text [::msgcat::mc "Forced termination time"] ttk::label $frm.lbl_expiration_timeout -text [::msgcat::mc "Expiration timeout"]
ttk::entry $frm.ent_expiration_timeout -textvariable expiration_timeout ttk::entry $frm.ent_expiration_timeout -textvariable expiration_timeout
ttk::label $frm.lbl_session_fault_tolerance_level -text [::msgcat::mc "Fault-tolerance level"] ttk::label $frm.lbl_session_fault_tolerance_level \
ttk::entry $frm.ent_session_fault_tolerance_level -textvariable session_fault_tolerance_level -text [::msgcat::mc "Session fault tolerance level"]
ttk::entry $frm.ent_session_fault_tolerance_level \
-textvariable session_fault_tolerance_level
ttk::label $frm.lbl_load_balancing_mode -text [::msgcat::mc "Load balancing mode"] ttk::label $frm.lbl_load_balancing_mode -text [::msgcat::mc "Load balancing mode"]
ttk::combobox $frm.cb_load_balancing_mode -textvariable load_balancing_mode \ ttk::combobox $frm.cb_load_balancing_mode -textvariable load_balancing_mode \
-values $default(load_balancing_mode) -values $default(load_balancing_mode)
ttk::label $frm.lbl_errors_count_threshold -text [::msgcat::mc "Server errors threshold"] ttk::label $frm.lbl_errors_count_threshold -text [::msgcat::mc "Errors count threshold"]
ttk::entry $frm.ent_errors_count_threshold -textvariable errors_count_threshold ttk::entry $frm.ent_errors_count_threshold -textvariable errors_count_threshold
ttk::label $frm.lbl_processes -text [::msgcat::mc "Working process"] ttk::label $frm.lbl_processes -text [::msgcat::mc "Processes"]
ttk::label $frm.lbl_lifetime_limit -text [::msgcat::mc "Restart time"] ttk::label $frm.lbl_lifetime_limit -text [::msgcat::mc "Lifetime limit"]
ttk::entry $frm.ent_lifetime_limit -textvariable lifetime_limit ttk::entry $frm.ent_lifetime_limit -textvariable lifetime_limit
ttk::label $frm.lbl_max_memory_size -text [::msgcat::mc "Maximum virtual address space"] ttk::label $frm.lbl_max_memory_size -text [::msgcat::mc "Max memory size"]
ttk::entry $frm.ent_max_memory_size -textvariable max_memory_size ttk::entry $frm.ent_max_memory_size -textvariable max_memory_size
ttk::label $frm.lbl_max_memory_time_limit -text [::msgcat::mc "Maximum period of memori size exeeding"] ttk::label $frm.lbl_max_memory_time_limit -text [::msgcat::mc "Max memory time limit"]
ttk::entry $frm.ent_max_memory_time_limit -textvariable max_memory_time_limit ttk::entry $frm.ent_max_memory_time_limit -textvariable max_memory_time_limit
ttk::label $frm.lbl_kill_problem_processes -justify left -anchor nw -text [::msgcat::mc "Terminate corrupted processes"] ttk::label $frm.lbl_kill_problem_processes -justify left -anchor nw \
ttk::checkbutton $frm.check_kill_problem_processes -variable kill_problem_processes -onvalue yes -offvalue no -text [::msgcat::mc "Kill problem processes"]
ttk::checkbutton $frm.check_kill_problem_processes \
-variable kill_problem_processes -onvalue yes -offvalue no
ttk::checkbutton $frm.check_kill_by_memory_with_dump \
-variable kill_by_memory_with_dump -onvalue yes -offvalue no
ttk::label $frm.lbl_kill_by_memory_with_dump -justify left -anchor nw \
-text [::msgcat::mc "Kill by memory with dump"]
grid $frm.lbl_host -row 0 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.lbl_host -row 0 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.ent_host -row 0 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.ent_host -row 0 -column 1 -sticky nsew -padx 5 -pady 5
@ -1195,7 +1220,7 @@ proc Add::cluster {tree host values} {
grid $frm.ent_port -row 1 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.ent_port -row 1 -column 1 -sticky nsew -padx 5 -pady 5
grid $frm.lbl_name -row 2 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.lbl_name -row 2 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.ent_name -row 2 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.ent_name -row 2 -column 1 -sticky nsew -padx 5 -pady 5
grid $frm.lbl_secure_connect -row 3 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.lbl_security_level -row 3 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.cb_security_level -row 3 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.cb_security_level -row 3 -column 1 -sticky nsew -padx 5 -pady 5
grid $frm.lbl_expiration_timeout -row 4 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.lbl_expiration_timeout -row 4 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.ent_expiration_timeout -row 4 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.ent_expiration_timeout -row 4 -column 1 -sticky nsew -padx 5 -pady 5
@ -1214,6 +1239,8 @@ proc Add::cluster {tree host values} {
grid $frm.ent_max_memory_time_limit -row 11 -column 1 -sticky nsew -padx 5 -pady 5 grid $frm.ent_max_memory_time_limit -row 11 -column 1 -sticky nsew -padx 5 -pady 5
grid $frm.lbl_kill_problem_processes -row 12 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.lbl_kill_problem_processes -row 12 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.check_kill_problem_processes -row 12 -column 1 -sticky nw -padx 5 -pady 5 grid $frm.check_kill_problem_processes -row 12 -column 1 -sticky nw -padx 5 -pady 5
grid $frm.lbl_kill_by_memory_with_dump -row 13 -column 0 -sticky nw -padx 5 -pady 5
grid $frm.check_kill_by_memory_with_dump -row 13 -column 1 -sticky nw -padx 5 -pady 5
.add.frm_btn.btn_ok configure -command { .add.frm_btn.btn_ok configure -command {
RunCommand "cluster insert \ RunCommand "cluster insert \
@ -1229,6 +1256,7 @@ proc Add::cluster {tree host values} {
--load-balancing-mode=$load_balancing_mode \ --load-balancing-mode=$load_balancing_mode \
--errors-count-threshold=$errors_count_threshold \ --errors-count-threshold=$errors_count_threshold \
--kill-problem-processes=$kill_problem_processes \ --kill-problem-processes=$kill_problem_processes \
--kill-by-memory-with-dump=$kill_by_memory_with_dump \
$auth_agent $host" $auth_agent $host"
Run::server $tree $host "" Run::server $tree $host ""
destroy .add destroy .add
@ -1766,7 +1794,8 @@ proc Edit::server {tree host value} {
proc Edit::cluster {tree host values} { proc Edit::cluster {tree host values} {
global default lifetime_limit expiration_timeout session_fault_tolerance_level global default lifetime_limit expiration_timeout session_fault_tolerance_level
global max_memory_size max_memory_time_limit errors_count_threshold security_level global max_memory_size max_memory_time_limit errors_count_threshold security_level \
kill_by_memmory_with_dump
global load_balancing_mode kill_problem_processes active_cluster \ global load_balancing_mode kill_problem_processes active_cluster \
agent_user agent_pwd cluster_user cluster_pwd auth agent_user agent_pwd cluster_user cluster_pwd auth
if {$cluster_user ne "" && $cluster_pwd ne ""} { if {$cluster_user ne "" && $cluster_pwd ne ""} {
@ -1800,6 +1829,7 @@ proc Edit::cluster {tree host values} {
--load-balancing-mode=$load_balancing_mode \ --load-balancing-mode=$load_balancing_mode \
--errors-count-threshold=$errors_count_threshold \ --errors-count-threshold=$errors_count_threshold \
--kill-problem-processes=$kill_problem_processes \ --kill-problem-processes=$kill_problem_processes \
--kill-by-memory-with-dump=$kill_by_memory_with_dump \
$auth $host" $auth $host"
$tree delete "cluster::$active_cluster" $tree delete "cluster::$active_cluster"
Run::server $tree $host "" Run::server $tree $host ""
@ -2454,3 +2484,4 @@ proc Del::inet {tree host profile_name} {

1
lib/gui.tcl
View File

@ -120,3 +120,4 @@ pack $frm_tree $frm_work -side left -expand true -fill both

23
lib/msg/ru.msg
View File

@ -27,13 +27,14 @@
::msgcat::mcset ru "OS user name" "Пользователь ОС" ::msgcat::mcset ru "OS user name" "Пользователь ОС"
::msgcat::mcset ru "Authentication method" "Способ аутентификации" ::msgcat::mcset ru "Authentication method" "Способ аутентификации"
::msgcat::mcset ru "Add record" "Добавить запись" ::msgcat::mcset ru "Add record" "Добавить запись"
::msgcat::mcset ru "Main server" "Основной сервер" ::msgcat::mcset ru "Host" "Основной сервер"
::msgcat::mcset ru "Main server address" "Адрес основного сервера" ::msgcat::mcset ru "Host address" "Адрес основного сервера"
::msgcat::mcset ru "Address" "Адрес сервера" ::msgcat::mcset ru "Address" "Адрес сервера"
::msgcat::mcset ru "Port" "Порт" ::msgcat::mcset ru "Port" "Порт"
::msgcat::mcset ru "Ports range" "Диапазон портов" ::msgcat::mcset ru "Ports range" "Диапазон портов"
::msgcat::mcset ru "Protocol" "Протокол" ::msgcat::mcset ru "Protocol" "Протокол"
::msgcat::mcset ru "Working processes" "Рабочие процессы" ::msgcat::mcset ru "Working processes" "Рабочие процессы"
::msgcat::mcset ru "Processes" "Рабочие процессы"
::msgcat::mcset ru "Cluster managers" "Менеджеры кластера" ::msgcat::mcset ru "Cluster managers" "Менеджеры кластера"
::msgcat::mcset ru "Maximum memory in working processes" "Максимальный объём памяти раб. процессов" ::msgcat::mcset ru "Maximum memory in working processes" "Максимальный объём памяти раб. процессов"
::msgcat::mcset ru "Safe memory consuption per call" "Безопасный расход памяти за вызов" ::msgcat::mcset ru "Safe memory consuption per call" "Безопасный расход памяти за вызов"
@ -54,15 +55,16 @@
::msgcat::mcset ru "Create database" "Создать БД в случае её отсутствия" ::msgcat::mcset ru "Create database" "Создать БД в случае её отсутствия"
::msgcat::mcset ru "Sheduled jobs deny" "Блокировка регламентных заданий" ::msgcat::mcset ru "Sheduled jobs deny" "Блокировка регламентных заданий"
::msgcat::mcset ru "Date offset" "Смещение дат" ::msgcat::mcset ru "Date offset" "Смещение дат"
::msgcat::mcset ru "Secure level" "Безопасное соединение" ::msgcat::mcset ru "Security level" "Безопасное соединение"
::msgcat::mcset ru "Forced termination time" "Останавливать выключенные процессы через:" ::msgcat::mcset ru "Expiration timeout" "Останавливать выключенные процессы через:"
::msgcat::mcset ru "Fault-tolerance level" "Уровень отказоустойчивости" ::msgcat::mcset ru "Session fault tolerance level" "Уровень отказоустойчивости"
::msgcat::mcset ru "Load balancing mode" "Режим распределения нагрузки" ::msgcat::mcset ru "Load balancing mode" "Режим распределения нагрузки"
::msgcat::mcset ru "Server errors threshold" "Допустимое отклонение количества ошибок сервера, %" ::msgcat::mcset ru "Errors count threshold" "Допустимое отклонение количества ошибок сервера, %"
::msgcat::mcset ru "Restart time" "Период перезапуска, сек." ::msgcat::mcset ru "Lifetime limit" "Период перезапуска, сек."
::msgcat::mcset ru "Maximum virtual address space" "Допустимый объём памяти, КБ" ::msgcat::mcset ru "Max memory size" "Допустимый объём памяти, КБ"
::msgcat::mcset ru "Maximum period of memori size exeeding" "Интервал превышения допустимого объёма памяти, сек." ::msgcat::mcset ru "Max memory time limit" "Интервал превышения допустимого объёма памяти, сек."
::msgcat::mcset ru "Terminate corrupted processes" "Принудительно завершать проблемные процессы" ::msgcat::mcset ru "Kill problem processes" "Принудительно завершать проблемные процессы"
::msgcat::mcset ru "Kill by memory with dump" "Формировать дамп процесса при превышении объема памяти"
::msgcat::mcset ru "Object type" "Объект требования" ::msgcat::mcset ru "Object type" "Объект требования"
::msgcat::mcset ru "Rule type" "Тип требования" ::msgcat::mcset ru "Rule type" "Тип требования"
::msgcat::mcset ru "Application with an ajustment" "Значение доп. параметра" ::msgcat::mcset ru "Application with an ajustment" "Значение доп. параметра"
@ -112,3 +114,4 @@
::msgcat::mcset ru "Session lock mode management" "Режим блокировки сеансов" ::msgcat::mcset ru "Session lock mode management" "Режим блокировки сеансов"
::msgcat::mcset ru "External session management required" "Внешнее управление сеансами" ::msgcat::mcset ru "External session management required" "Внешнее управление сеансами"
::msgcat::mcset ru "Path to RAC" "Путь до RAC" ::msgcat::mcset ru "Path to RAC" "Путь до RAC"