lib/splash/config/sanitycheck.rb in prometheus-splash-0.3.0 vs lib/splash/config/sanitycheck.rb in prometheus-splash-0.4.0

@@ -1,56 +1,60 @@
 # coding: utf-8
 module Splash
   module ConfigUtilities
     include Splash::Constants
 
+
+
     # Sanitycheck action method for testing installation of Splash
     # @return [Integer] an errorcode value
-    def checkconfig
-      puts "Splash -> sanitycheck : "
+    def checkconfig(options ={})
+      self.extend Splash::Loggers
+      log = get_logger
+      log.info "Splash -> sanitycheck : "
       config = get_config
       full_res = 0
-      print "* Config file : #{CONFIG_FILE} : "
       res = verify_file(name: CONFIG_FILE, mode: "644", owner: config.user_root, group: config.group_root)
+      target = "Config file : #{CONFIG_FILE}"
       if res.empty? then
-        print "[OK]\n"
+        log.ok target
       else
-        print "[KO]\n"
+        log.ko target
         full_res =+ 1
-        puts "    pbm => #{res.map {|p| p.to_s}.join(',')}"
+        log.flat "    pbm => #{res.map {|p| p.to_s}.join(',')}"
       end
 
-      print "* PID Path : #{config[:pid_path]} : "
+      target = "PID Path : #{config[:pid_path]}"
       res = verify_folder(name: config[:pid_path], mode: "644", owner: config.user_root, group: config.group_root)
       if res.empty? then
-        print "[OK]\n"
+        log.ok target
       else
-        print "[KO]\n"
+        log.ko target
         full_res =+ 1
-        puts "    pbm => #{res.map {|p| p.to_s}.join(',')}"
+        log.flat "    pbm => #{res.map {|p| p.to_s}.join(',')}"
 
       end
 
-      print "* trace Path : #{config[:trace_path]} : "
-      res = verify_folder(name: config[:trace_path], mode: "777", owner: config.user_root, group: config.group_root)
+      target =  "Trace Path : #{config[:trace_path]}"
+      res = verify_folder(name: config[:trace_path], mode: "644", owner: config.user_root, group: config.group_root)
       if res.empty? then
-        print "[OK]\n"
+        log.ok target
       else
-        print "[KO]\n"
+        log.ko target
         full_res =+ 1
-        puts "    pbm => #{res.map {|p| p.to_s}.join(',')}"
+        log.flat "    pbm => #{res.map {|p| p.to_s}.join(',')}"
       end
 
-      print "* Prometheus PushGateway Service running : "
+      target = "Prometheus PushGateway Service running"
       if verify_service host: config.prometheus_pushgateway_host ,port: config.prometheus_pushgateway_port then
-        print "[OK]\n"
+        log.ok target
       else
-        print "[KO]\n"
+        log.ko target
         full_res =+ 1
       end
 
       if full_res > 0 then
-        $stderr.puts " => #{full_res} errors occured"
+        log.error "#{full_res} errors occured"
         return { :case => :splash_sanitycheck_error }
       else
         return { :case => :splash_sanitycheck_success}
       end
     end