Добавлено имя кластера в конфиг. Исправлен баг с пробелами в именах кластера и ИБ при создании

This commit is contained in:
Sergey 2019-11-30 12:28:52 +03:00
parent 003c122930
commit ba0e53797f
2 changed files with 6 additions and 5 deletions

View File

@ -211,4 +211,3 @@ proc CopyNewConfig {} {
}
}

View File

@ -47,7 +47,8 @@ proc SetGlobalVarFromTreeItems {tree id} {
set server $values
}
cluster {
set active_cluster $values
set active_cluster $values
#puts $values
#dict set servers_list servers $host clusters "$values {}"
set cluster_user [GetClusterAdmin $host $active_cluster]
set cluster_pwd [GetClusterPassword $host $active_cluster]
@ -441,7 +442,7 @@ proc Run::server {tree host values} {
InsertClusterItems $tree $id
}
#dict replace servers_list [dict get servers_list servers $host clusters]
#dict set servers_list servers $host clusters $id name $cluster_name
dict set servers_list servers $host clusters $id cluster_name $cluster_name
#puts $cluster_name
#puts $servers_list
}
@ -1242,7 +1243,7 @@ proc Add::infobases {tree host values} {
}
RunCommand "infobase create $db_create \
--name=[.add.frm.ent_name get] \
--name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "] \
--dbms=$dbms \
--db-server=[.add.frm.ent_db_server get] \
--db-name=[.add.frm.ent_db_name get] \
@ -1911,7 +1912,7 @@ proc Edit::cluster {tree host values} {
.add.frm_btn.btn_ok configure -command {
RunCommand "cluster update \
--cluster=$active_cluster $auth \
--name=[.add.frm.ent_name get] \
--name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "] \
--expiration-timeout=$expiration_timeout \
--lifetime-limit=$lifetime_limit \
--max-memory-size=$max_memory_size \
@ -2582,3 +2583,4 @@ proc Del::inet {tree host profile_name} {