WebSVN – camp_sysinfo_client_3 – Diff – //trunk/sysinfo-client

 # sysinfo
 # Author: R. W. Rodolico
 # Primary client portion of sysinfo system. Will collect information about its current
 # host and create a report containing the information. This report can then be processed
 # by process_sysinfo.pl on the collection computer.
-# output file consists of an XML file of the form:
+# output file consists of a YAML file of the form:
 #  <sysinfo3.0.0>
 #    <diskinfo name='/dev/xvda3'>
 #      <fstype>ext3</fstype>
 #      <mount>/home</mount>
 #      <size>51606140</size>
 # added UUID to configuration file
+#
 # Version 3.2.1 20180424 RWR
 # Finally got a semi-stable version of this running. Fixed a bunch of bugs
 # and appears to be working correctly.
+#
+# Version 3.3.0 20190419 RWR
+# Converted to use YAML config file
+# find our location and use it for searching for libraries
+BEGIN {
+   use FindBin;
+   use File::Spec;
+   use lib File::Spec->catdir($FindBin::Bin);
+}
+use YAML::Tiny;
 # Following are global variables overridden if configuration file exists
 my $TESTING = 0; # level's 0 (none) to 4 defined and increase verbosity while decreasing functionality
-our $VERSION = '3.2.1';
+our $VERSION = '3.3.0';
 my $indentLevel = 2; # number of spaces to indent per level in XML or YAML
 $indentLevel = 3 if $TESTING;
 if ($TESTING) {
+}
 # paths to search for configuration file
 my @confFileSearchPath = ( '.', '/etc/camp/sysinfo-client', '/etc/camp', '/usr/local/etc/camp/sysinfo-client' );
-my $configurationFile = 'sysinfo-client.conf'; # name of the configuration file
+my $configurationFile = 'sysinfo-client.yaml'; # name of the configuration file
 my $reportDate = &getReportDate; # set report date
 my %configuration = (
    'moduleDirs' => [], # search paths for modules
 #######################################################
+#
 # loadConfigurationFile($confFile)
+#
 # Loads configuration file defined by $configurationFile, and dies if not available
-# Reads entire contents into memory where it is eval'd in main program
+# This is a YAML file containing serialized contents of
 # Parameters: configuration file fully path/file name
 # NOTE: conf file must be a valid Perl file
+#
 #######################################################
 sub loadConfigurationFile {
    my ( $fileName, @searchPath ) = @_;
    my $confFile;
    if ( $confFile = &findFile( $fileName, \@searchPath ) ) {
       print "Opening configuration from $confFile\n" if $TESTING > 2;
-      open CONFFILE, "<$confFile" or die "Can not open configuration file $confFile: $!\n";
+      my $yaml = YAML::Tiny->read( $confFile );
-      my $confFileContents = join( '', <CONFFILE> ); # just slurp it into memory
-      close CONFFILE;
-      return ($confFileContents);
+      return $yaml->[0];
+   }
    die "Can not find $fileName in any of " . join( "\n\t", @searchPath ) . "\n";
+}
 #######################################################
+#
 # escapeForYAML
+#
 # Escapes values put into YAML report
+#
+# DEPRECATED AS OF VERSION 3.3.0
+# uses YAML::Tiny
+#
 #######################################################
-sub escapeForYAML {
+#sub escapeForYAML {
-   my $value = shift;
+#   my $value = shift;
-   $value =~ s/'/\\'/gi; # escape single quotes
+#   $value =~ s/'/\\'/gi; # escape single quotes
-   $value =~ s/"/\\"/gi; # escape double quotes
+#   $value =~ s/"/\\"/gi; # escape double quotes
-   # pound sign indicates start of a comment and thus loses part
+#   # pound sign indicates start of a comment and thus loses part
-   # of strings. Surrounding it by double quotes in next statement
+#   # of strings. Surrounding it by double quotes in next statement
-   # allows
+#   # allows
-   $value = '"' . $value . '"' if ( $value =~ m/[#:]/ );
+#   $value = '"' . $value . '"' if ( $value =~ m/[#:]/ );
-   return $value;
+#   return $value;
-}
+#}
 #######################################################
+#
 # hashToYAML( $hashRef, $indent )
+#
 # However, I followed all the RFC for the values that were given, so
 # assume any YAML reader can parse this
 # NOTE: YAML appears to give a resulting file 1/3 smaller than the above
 #       XML, and compresses down in like manner
+#
+# DEPRECATED AS OF VERSION 3.3.0
+# uses YAML::Tiny
+#
 #######################################################
-sub hashToYAML {
+#sub hashToYAML {
-   my ($hashRef, $indent) = @_;
+#   my ($hashRef, $indent) = @_;
-   $indent = 0 unless $indent; # default to 0 if not defined
+#   $indent = 0 unless $indent; # default to 0 if not defined
+#
-   my $output; # where the output is stored
+#   my $output; # where the output is stored
-   foreach my $key ( keys %$hashRef ) { # for each key in the current reference
+#   foreach my $key ( keys %$hashRef ) { # for each key in the current reference
-      print "Looking at $key\n" if $TESTING > 3;
+#      print "Looking at $key\n" if $TESTING > 3;
-      # see http://www.perlmonks.org/?node_id=175651 for isa function
+#      # see http://www.perlmonks.org/?node_id=175651 for isa function
-      if ( UNIVERSAL::isa( $$hashRef{$key}, 'HASH' ) ) { # is the value another hash?
+#      if ( UNIVERSAL::isa( $$hashRef{$key}, 'HASH' ) ) { # is the value another hash?
-            # NOTE: unlike xml, indentation is NOT optional in YAML, so the following line verifies $indentlevel is non-zero
+#            # NOTE: unlike xml, indentation is NOT optional in YAML, so the following line verifies $indentlevel is non-zero
-            #       and, if it is, uses a default 3 character indentation
+#            #       and, if it is, uses a default 3 character indentation
-            $output .= (' ' x $indent ) . &escapeForYAML($key) . ":\n" . # key, plus colon, plus newline
+#            $output .= (' ' x $indent ) . &escapeForYAML($key) . ":\n" . # key, plus colon, plus newline
-                    &hashToYAML( $$hashRef{$key}, $indent+($indentLevel ? $indentLevel : 3) ) . # add results of recursive call
+#                    &hashToYAML( $$hashRef{$key}, $indent+($indentLevel ? $indentLevel : 3) ) . # add results of recursive call
-                    "\n";
+#                    "\n";
-      } elsif ( UNIVERSAL::isa( $$hashRef{$key}, 'ARRAY' ) ) { # is it an array? ignore it
+#      } elsif ( UNIVERSAL::isa( $$hashRef{$key}, 'ARRAY' ) ) { # is it an array? ignore it
-      } else { # it is a scalar, so just do <key>value</key>
+#      } else { # it is a scalar, so just do <key>value</key>
-         $output .= (' ' x $indent ) . &escapeForYAML($key) . ': ' . &escapeForYAML($$hashRef{$key}) . "\n";
+#         $output .= (' ' x $indent ) . &escapeForYAML($key) . ': ' . &escapeForYAML($$hashRef{$key}) . "\n";
-      }
+#      }
-   }
+#   }
-   return $output;
+#   return $output;
-}
+#}
 #######################################################
+#
 # tabDelimitedToHash ($hashRef, $tabdelim)
 &processParameters( @ARGV );
 # load the configuration file
 #die "Searching for $configurationFile in = \n" . join( "\n", @confFileSearchPath ) . "\n";
+%configuration = %{ &loadConfigurationFile( $configurationFile, @confFileSearchPath) };
-eval ( &loadConfigurationFile( $configurationFile, @confFileSearchPath) ) or die "Could not load config: $@\n";
+#eval ( &loadConfigurationFile( $configurationFile, @confFileSearchPath) ) or die "Could not load config: $@\n";
 die Dumper( \%configuration ) . "\n" if $TESTING > 4;
 # user did not define a serial number, so make something up
 $configuration{'serialNumber'} = '' unless $configuration{'serialNumber'};
 # oops, no client name (required) so tell them and exit
 foreach my $moduleDir ( @{$configuration{'moduleDirs'}} ) {
    &ProcessModules( $System, "$moduleDir/" );
+}
 # now, everything ins in $System, so convert it to the proper output format
-my $out =  "#sysinfo: $VERSION YAML\n---\n" . &hashToYAML( $System ) . "...\n";
+#my $out = "#sysinfo: $VERSION YAML\n---\n" . &hashToYAML( $System ) . "...\n";
+my $out =  "#sysinfo: $VERSION YAML\n" . Dump( $System );
 #print Data::Dumper->Dump([$System],['System']) if $TESTING>2;
 # load some global values for use in the script, if required
 my $globals = {

Subversion Repositories camp_sysinfo_client_3

(root)//trunk/sysinfo-client – Rev 85 → 112