Skip to content
Snippets Groups Projects
Commit d900bca1 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

pridana kontrola parametru client_id jako integer; smazana kontrola parametru...

pridana kontrola parametru client_id jako integer; smazana kontrola parametru client_id jestli je definovan, jelikoz kontrolu zajisti odchytavani poctu argumentu skriptu; lepsi prehlednost kodu (nahrazeni negovanych ifu za unless); uprava odsazeni
parent 14469628
No related branches found
No related tags found
No related merge requests found
...@@ -95,17 +95,18 @@ if ($help) { ...@@ -95,17 +95,18 @@ if ($help) {
# catch version option # catch version option
if ($script_version) { if ($script_version) {
version; version;
} }
# check parameters definition # check parameters definition
if (!defined $client_id) { if ($client_id !~ /^\d+\z/) {
WardenCommon::errMsg("Parameter 'client_id' is not defined!"); WardenCommon::errMsg("Parameter '-i <client_id>' is not a integer");
} }
# connect to DB # connect to DB
my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS); my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
# obtain a server hostname
my $warden_server = WardenCommon::trim(`hostname -f`); my $warden_server = WardenCommon::trim(`hostname -f`);
# check if client has been already registered # check if client has been already registered
...@@ -114,7 +115,7 @@ $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr; ...@@ -114,7 +115,7 @@ $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr;
my ($id, $hostname, $service, $client_type, $type) = $sth->fetchrow(); my ($id, $hostname, $service, $client_type, $type) = $sth->fetchrow();
# delete registered client # delete registered client
if (!defined $id) { unless (defined $id) {
sendMsg("err", "Attempt to delete unregister client [Client_id: '$client_id'] from Warden server '$warden_server'"); sendMsg("err", "Attempt to delete unregister client [Client_id: '$client_id'] from Warden server '$warden_server'");
WardenCommon::errMsg("Client (#$client_id) is not registered at Warden server '$warden_server'"); WardenCommon::errMsg("Client (#$client_id) is not registered at Warden server '$warden_server'");
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment