Remove duplicate read_config section from sct_protek_common.tcl
This commit is contained in:
@ -231,90 +231,7 @@ proc ::scobj::add_protekmm::read_config {} {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
set arg_list [list]
|
set arg_list [list]
|
||||||
foreach arg {name ip port datype id scal offset interval cbfunc} {
|
foreach arg {name ip port datype id scale offset interval} {
|
||||||
if {[dict exists $v $arg]} {
|
|
||||||
lappend arg_list "[dict get $v $arg]"
|
|
||||||
} else {
|
|
||||||
${ns}::sics_log 9 "Missing configuration value $arg"
|
|
||||||
error "Missing configuration value $arg"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
add_protekmm ${name} "aqadapter" ${asyncqueue} {*}$arg_list
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch_message ]
|
|
||||||
handle_exception ${catch_status} ${catch_message}
|
|
||||||
}
|
|
||||||
|
|
||||||
if { [info exists ::config_dict] } {
|
|
||||||
::scobj::add_protekmm::read_config
|
|
||||||
} else {
|
|
||||||
::scobj::add_protekmm::sics_log 5 "No config dict"
|
|
||||||
}
|
|
||||||
# Check config_dict for configuration
|
|
||||||
namespace eval ::scobj::add_protekmm {
|
|
||||||
set debug_threshold 5
|
|
||||||
}
|
|
||||||
proc ::scobj::add_protekmm::sics_log {debug_level debug_string} {
|
|
||||||
set catch_status [ catch {
|
|
||||||
set debug_threshold ${::scobj::add_protekmm::debug_threshold}
|
|
||||||
if {${debug_level} >= ${debug_threshold}} {
|
|
||||||
sicslog "::scobj::add_protekmm::${debug_string}"
|
|
||||||
}
|
|
||||||
} catch_message ]
|
|
||||||
}
|
|
||||||
|
|
||||||
clientput "file evaluation of sct_protekmm.tcl"
|
|
||||||
::scobj::add_protekmm::sics_log 9 "file evaluation of sct_protekmm.tcl"
|
|
||||||
|
|
||||||
proc ::scobj::add_protekmm::read_config {} {
|
|
||||||
set catch_status [ catch {
|
|
||||||
set ns "::scobj::add_protekmm"
|
|
||||||
dict for {k v} $::config_dict {
|
|
||||||
if { [dict exists $v "implementation"] } {
|
|
||||||
if { !([dict exists $v "name"] && [dict exists $v "enabled"]) } {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
set name [dict get $v name]
|
|
||||||
set enabled [string tolower [dict get $v "enabled"]]
|
|
||||||
set implementation [dict get $v "implementation"]
|
|
||||||
if { !([dict exists $::config_dict $implementation]) } {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
set v [dict get $::config_dict $implementation]
|
|
||||||
if { !([dict exists $v "driver"]) } {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if { [string equal -nocase [dict get $v "driver"] "add_protekmm"] } {
|
|
||||||
if { [string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"] } {
|
|
||||||
if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
|
|
||||||
set asyncqueue "null"
|
|
||||||
${ns}::sics_log 9 "[environment_simulation] => using null asyncqueue"
|
|
||||||
} elseif { [dict exists $v "asyncqueue"] } {
|
|
||||||
set asyncqueue [dict get $v "asyncqueue"]
|
|
||||||
} else {
|
|
||||||
if { [dict exists $v "asyncprotocol"] } {
|
|
||||||
set asyncprotocol [dict get $v "asyncprotocol"]
|
|
||||||
} else {
|
|
||||||
set asyncprotocol ${name}_protocol
|
|
||||||
MakeAsyncProtocol ${asyncprotocol}
|
|
||||||
if { [dict exists $v "terminator"] } {
|
|
||||||
${asyncprotocol} sendterminator "[dict get $v "terminator"]"
|
|
||||||
${asyncprotocol} replyterminator "[dict get $v "terminator"]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
set asyncqueue ${name}_queue
|
|
||||||
set IP [dict get $v ip]
|
|
||||||
set PORT [dict get $v port]
|
|
||||||
MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT}
|
|
||||||
if { [dict exists $v "timeout"] } {
|
|
||||||
${asyncqueue} timeout "[dict get $v "timeout"]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
set arg_list [list]
|
|
||||||
foreach arg {name ip port datype id scale offset interval cbfunc} {
|
|
||||||
if {[dict exists $v $arg]} {
|
if {[dict exists $v $arg]} {
|
||||||
lappend arg_list "[dict get $v $arg]"
|
lappend arg_list "[dict get $v $arg]"
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user