ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/ihost-perl/ihost.pl
(Generate patch)

Comparing projects/cms/source/host/ihost-perl/ihost.pl (file contents):
Revision 1.12 by pjm2, Thu Feb 1 09:24:54 2001 UTC vs.
Revision 1.17 by pjm2, Tue Feb 27 19:14:26 2001 UTC

# Line 32 | Line 32 | use vars qw (
32               $tcp_port
33               $filter_addr
34               $file_list
35 +             $fqdn
36              );
37  
38   if (@ARGV != 2) {
# Line 119 | Line 120 | sub tcp_configure() {
120  
121      print "File list obtained: $file_list\n";
122  
123 +    print $sock "FQDN\n";
124 +    $response = <$sock>;
125 +    chop $response;
126 +    $fqdn = $response;
127 +
128 +    print "FQDN returned: $fqdn\n";
129 +
130      print $sock "UDPUpdateTime\n";
131      $response = <$sock>;
132      chop $response;
# Line 180 | Line 188 | sub send_udp_packet() {
188  
189      my(@statgrab) = `./statgrab.pl`;
190      my(%packet);
191 <    for (my($i) = 0; $i < $#statgrab; $i++) {
191 >    for (my($i) = 0; $i <= $#statgrab; $i++) {
192          $statgrab[$i] =~ /^([^\s]*) (.*)$/;
193          $packet{$1} = $2;
194      }
# Line 190 | Line 198 | sub send_udp_packet() {
198      my($disk_info) = "<disk>";
199      my($i) = 0;
200      while (defined $packet{"packet.disk.p$i.attributes.mount"}) {
201 <        $disk_info .= "<p$i>";
202 <        $disk_info .= qq/<name>$packet{"packet.disk.p$i.attributes.name"}<\/name>/;
203 <        $disk_info .= qq/<kbytes>$packet{"packet.disk.p$i.attributes.kbytes"}<\/kbytes>/;
204 <        $disk_info .= qq/<used>$packet{"packet.disk.p$i.attributes.used"}<\/used>/;
205 <        $disk_info .= qq/<avail>$packet{"packet.disk.p$i.attributes.avail"}<\/avail>/;
206 <        $disk_info .= qq/<mount>$packet{"packet.disk.p$i.attributes.mount"}<\/mount>/;
207 <        $disk_info .= "</p$i>";
201 >        $disk_info .= "<p$i";
202 >        $disk_info .= " name=\"" . $packet{"packet.disk.p$i.attributes.name"} . "\"";
203 >        $disk_info .= " kbytes=\"" . $packet{"packet.disk.p$i.attributes.kbytes"} . "\"";
204 >        $disk_info .= " used=\"" . $packet{"packet.disk.p$i.attributes.used"} . "\"";
205 >        $disk_info .= " avail=\"" . $packet{"packet.disk.p$i.attributes.avail"} . "\"";
206 >        $disk_info .= " mount=\"" . $packet{"packet.disk.p$i.attributes.mount"} . "\"";
207 >        $disk_info .= "></p$i>";
208          ++$i;
209      }
210      $disk_info .= "</disk>";
211  
212      my($hostname) = hostname();
213      $hostname =~ s/\..*$//g;
214 <    `cat /etc/resolv.conf` =~ /domain\s+([^\s]+)/;
215 <    my($domainname) = $1;
216 <    my($machine_name) = "$hostname.$domainname";
214 >    my($resolv) = `cat /etc/resolv.conf`;
215 >    my($domainname);
216 >    my($machine_name);
217 >    if($resolv =~ /domain\s+([^\s]+)/) {
218 >        # some machines have domain <domain> in resolv.conf
219 >        $domainname = $1;
220 >        $machine_name = "$hostname.$domainname";
221 >    }
222 >    elsif($resolv =~ /search\s+([^\s]+)/) {
223 >        # some machines have search <domain> in resolv.conf
224 >        $domainname = $1;
225 >        $machine_name = "$hostname.$domainname";
226 >    }
227 >    else {
228 >        # we can't find out the domain
229 >        $machine_name = $hostname;
230 >    }
231      my($ip) = inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
232  
233      # Build the XML packet this way, as we can clearly
# Line 247 | Line 269 | sub send_udp_packet() {
269          <swap>$packet{"packet.cpu.swap"}</swap>
270      </cpu>
271      <memory>
272 <        <total>$packet{"packet.memory.real"}</total>
272 >        <total>$packet{"packet.memory.total"}</total>
273          <free>$packet{"packet.memory.free"}</free>
274      </memory>
275      <swap>
276 <        <total>$packet{"packet.memory.swap_total"}</total>
277 <        <free>$packet{"packet.memory.swap_free"}</free>
276 >        <total>$packet{"packet.swap.total"}</total>
277 >        <free>$packet{"packet.swap.free"}</free>
278      </swap>
279      $disk_info
280   </packet>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines