diff --git a/src/warden-client/doc/example-info.pl.txt b/src/warden-client/doc/example-info.pl.txt index 21114643ac10688b422ff3662d5e1f2c3a4b3d66..3af0e22966035831cd5099a0f0b9582daaaeb49d 100755 --- a/src/warden-client/doc/example-info.pl.txt +++ b/src/warden-client/doc/example-info.pl.txt @@ -28,17 +28,18 @@ my @clients = WardenClientCommon::getClientsInfo($warden_path) or exit 1; # rece print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "| Client ID | Hostname | Registered | Requestor | Service | CT | Type | ROE | Description tags | IP Net Client |\n"; print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; + foreach (@clients) { - 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"); + printf("| %-10s ", $_->{'client_id'} || "unknown"); + printf("| %-30s ", $_->{'hostname'} || "unknown"); + printf("| %19s ", $_->{'registered'} || "unknown"); + printf("| %-23s ", $_->{'requestor'} || "unknown"); + printf("| %-25s ", $_->{'service'} || "unknown"); + printf("| %-2s ", $_->{'client_type'} || "unknown"); + printf("| %-15s ", $_->{'type'} || "unknown"); + printf("| %-4s ", $_->{'receive_own_events'} || "unknown"); + printf("| %-50s ", $_->{'description_tags'} || "unknown"); + printf("| %-18s |\n", $_->{'ip_net_client'} || "unknown"); } print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "\n"; diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm index ca6471dbc274290d800f42fab7f085db17002ec0..1131c4aa433ff8e960495593f5f45483c2776442 100755 --- a/src/warden-client/lib/WardenClientCommon.pm +++ b/src/warden-client/lib/WardenClientCommon.pm @@ -151,22 +151,21 @@ sub getClientsInfo while (scalar @response_list) { my $response_data = shift(@response_list); - my @client; - - $client_id = $response_data->{'CLIENT_ID'} ; - $hostname = $response_data->{'HOSTNAME'}; - $registered = $response_data->{'REGISTERED'}; - $requestor = $response_data->{'REQUESTOR'}; - $service = defined $response_data->{'SERVICE'} ? $response_data->{'SERVICE'} : "-"; - $client_type = $response_data->{'CLIENT_TYPE'}; - $type = defined $response_data->{'TYPE'} ? $response_data->{'TYPE'} : "-"; - $receive_own_events = defined $response_data->{'RECEIVE_OWN_EVENTS'} ? $response_data->{'RECEIVE_OWN_EVENTS'} : "-"; - $description_tags = defined $response_data->{'DESCRIPTION_TAGS'} ? $response_data->{'DESCRIPTION_TAGS'} : "-"; - $ip_net_client = $response_data->{'IP_NET_CLIENT'}; + my %client; + + $client{'client_id'} = $response_data->{'CLIENT_ID'} ; + $client{'hostname'} = $response_data->{'HOSTNAME'}; + $client{'registered'} = $response_data->{'REGISTERED'}; + $client{'requestor'} = $response_data->{'REQUESTOR'}; + $client{'service'} = defined $response_data->{'SERVICE'} ? $response_data->{'SERVICE'} : "-"; + $client{'client_type'} = $response_data->{'CLIENT_TYPE'}; + $client{'type'} = defined $response_data->{'TYPE'} ? $response_data->{'TYPE'} : "-"; + $client{'receive_own_events'} = defined $response_data->{'RECEIVE_OWN_EVENTS'} ? $response_data->{'RECEIVE_OWN_EVENTS'} : "-"; + $client{'description_tags'} = defined $response_data->{'DESCRIPTION_TAGS'} ? $response_data->{'DESCRIPTION_TAGS'} : "-"; + $client{'ip_net_client'} = $response_data->{'IP_NET_CLIENT'}; # push received clients from warden server into @clients which is returned - @client = ($client_id, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client); - push (@clients,\@client); + push (@clients,\%client); } return @clients;