From fd867328a165a9941cd97268a9bd1d09b2bd89ad Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 23 Oct 2012 13:34:46 +0200
Subject: [PATCH] doplnen unknown pokud neni klienta nalezen, doplnen unknown
pokud neni polozka klienta nalezena
---
src/warden-server/bin/getClients.pl | 20 ++++++++++----------
src/warden-server/bin/getStatus.pl | 10 +++++-----
src/warden-server/etc/warden-client.conf | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl
index d969893..63fff51 100755
--- a/src/warden-server/bin/getClients.pl
+++ b/src/warden-server/bin/getClients.pl
@@ -75,16 +75,16 @@ print "+------------------------------------------------------------------------
print "| Client ID | Hostname | Registered | Requestor | Service | CT | Type | ROE | Description tags | IP Net Client |\n";
print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
foreach (@clients) {
- printf("| %-10s ", @$_[0]);
- printf("| %-30s ", @$_[1]);
- printf("| %19s ", @$_[2]);
- printf("| %-23s ", @$_[3]);
- printf("| %-25s ", @$_[4]);
- printf("| %-2s ", @$_[5]);
- printf("| %-15s ", @$_[6]);
- printf("| %-4s ", @$_[7]);
- printf("| %-50s ", @$_[8]);
- printf("| %-18s |\n", @$_[9]);
+ printf("| %-10s ", @$_[0] || "unknown");
+ printf("| %-30s ", @$_[1] || "unknown");
+ printf("| %19s ", @$_[2] || "unknown");
+ printf("| %-23s ", @$_[3] || "unknown");
+ printf("| %-25s ", @$_[4] || "unknown");
+ printf("| %-2s ", @$_[5] || "unknown");
+ printf("| %-15s ", @$_[6] || "unknown");
+ printf("| %-4s ", @$_[7] || "unknown");
+ printf("| %-50s ", @$_[8] || "unknown");
+ printf("| %-18s |\n", @$_[9] || "unknown");
}
print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
print "\n";
diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl
index c93b89a..bcd6adf 100755
--- a/src/warden-server/bin/getStatus.pl
+++ b/src/warden-server/bin/getStatus.pl
@@ -122,11 +122,11 @@ if ($server_status[15] != 0) {
print "+----------------------------------------------------------------------------------------------------------------+\n";
foreach my $client_status_ref (@status){
my @client_status = @$client_status_ref;
- printf("| %-10s ", $client_status[0]);
- printf("| %-30s ", $client_status[1]);
- printf("| %-25s ", $client_status[2]);
- printf("| %-13s ", $client_status[3]);
- printf("| %-20s |\n", $client_status[4]);
+ printf("| %-10s ", $client_status[0] || "unknown");
+ printf("| %-30s ", $client_status[1] || "unknown");
+ printf("| %-25s ", $client_status[2] || "unknown");
+ printf("| %-13s ", $client_status[3] || "unknown");
+ printf("| %-20s |\n", $client_status[4] || "unknown");
}
print "+----------------------------------------------------------------------------------------------------------------+\n";
print "\n";
diff --git a/src/warden-server/etc/warden-client.conf b/src/warden-server/etc/warden-client.conf
index 1816343..945209a 100644
--- a/src/warden-server/etc/warden-client.conf
+++ b/src/warden-server/etc/warden-client.conf
@@ -13,7 +13,7 @@ $URI = "https://warden-dev.cesnet.cz:443/Warden";
$SSL_KEY_FILE = "/etc/ssl/private/warden-dev.cesnet.cz.key";
#-------------------------------------------------------------------------------
-# SSL_CERT_FILE - path toserver SSL certificate file
+# SSL_CERT_FILE - path to server SSL certificate file
#-------------------------------------------------------------------------------
$SSL_CERT_FILE = "/etc/ssl/certs/warden-dev.cesnet.cz.pem";
--
GitLab