sos 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28dbed2c23e3c687979de1935f3af789c9149bb
-  data.tar.gz: d2e1c03f241f4e240096e9b13afcc7795084a6fe
+  metadata.gz: 26dc01c8e7b2c3e12c88b1149b92cf2929de21a6
+  data.tar.gz: 1c13e9ac17fdf66a863a98d6ab1c6f54d40f8ec6
 SHA512:
-  metadata.gz: d792f0a6a1c714e1342676ccc78b9a371c728c9b8b073f90d7fb7fef76b51d2c66beafa2d9993ea110eb3bf8df18b7943132fee5a35c0619165694633c1e4da0
-  data.tar.gz: 4495b940bf93e2303d1a4226597ca27421c0c916d4dfe999cc8edfd606f7a2cee827c3a9b837d45104042b18da906373e44d97bf7212f687b1f59999dd93ed99
+  metadata.gz: 27d8abf56d44180ce27565623a58e0ce3df29f73c21ea473150784b62b2394c57bcfa8ddf92bdac74154cb240b07d7c898878a661261dd5ba08702dda2cf8325
+  data.tar.gz: 401e8211165f988a57078724c32ed72bfcf1b91366726b6faec0f9b4fd705a97d1e1c11565652021a45276eda7b38cd064687ceb4aad6e3bb8cf7cd0c708e7a9

data/lib/sos/openstack.rb

@@ -12,6 +12,7 @@ module OpenStack
    'openstack-ceilometer-api'       => ["#{VarLog}/ceilometer/api.log"],
    'openstack-ceilometer-central'   => ["#{VarLog}/ceilometer/central.log"],
    'openstack-ceilometer-collector' => ["#{VarLog}/ceilometer/collector.log"],
+   'openstack-ceilometer-compute'   => ["#{VarLog}/ceilometer/compute.log"],
    'openstack-cinder-api'           => ["#{VarLog}/cinder/api.log"],
    'openstack-cinder-scheduler'     => ["#{VarLog}/cinder/api.log"],
    'openstack-cinder-volume'        => ["#{VarLog}/cinder/api.log"],
@@ -27,6 +28,7 @@ module OpenStack
    'openstack-nova-conductor'       => ["#{VarLog}/nova/conductor.log"],
    'openstack-nova-console'         => ["#{VarLog}/nova/console.log"],
    'openstack-nova-consoleauth'     => ["#{VarLog}/nova/consoleauth.log"],
+   'openstack-nova-metadata-api'    => ["#{VarLog}/nova/metadata-api.log"],
    'openstack-nova-novncproxy'      => [""],
    'openstack-nova-scheduler'       => ["#{VarLog}/nova/scheduler.log"],
  }

data/lib/sos/services.rb

@@ -3,16 +3,12 @@ class Service
 
   def initialize(name, state, logs)
     @name      = name
-     if state =~ /on/i
-      @state = true
-    else
-      @state = false
-    end
+    @state = state =~ /on/i ? true : false
     @logs = logs
   end
 
   def has?(filter)
-    true if @name =~ /#{filter}/
+    @name =~ /#{filter}/ ? true : false
   end
 
   def to_s
@@ -21,37 +17,35 @@ class Service
 end
 
 class Services
-  def initialize(filter, run_level, logs)
+  def initialize(selector, run_level, filters, loglist)
     @services = []
 
-    list = %x{chkconfig --list | awk '#{filter} {print $1":"$#{run_level+2}}'}
-    list.each  { |line|
+    installed = %x{chkconfig --list | awk '#{selector} {print $1":"$#{run_level+2}}'}
+    installed.each  { |line|
       line_tab = line.chop.split(':')
       name = line_tab[0]
       state = line_tab[2]
-      @services << Service.new(name, state, logs[name])
+      log = loglist[name] ? loglist[name] : ''
+      @services << Service.new(name, state, log)
     }
+
+    if filters
+      services_all = @services
+      @services = services_all.get_by_name(filters)
+    end
   end
 
   def get_by_name(filters)
     list = []
     filters.each { |filter|
       @services.each { |service|
-        list << service.name if @service.has?(filter)
+        list << service if @service.has?(filter)
       }
     }
     list
   end
 
-  def get_by_name_all
-    list = []
-    @services.each { |service|
-      list << service.name
-    }
-    list
-  end
-
-  def enabled
+  def get_enabled
     list = []
     @services.each { |service|
       list << service if service.state

data/lib/sos.rb

@@ -1,13 +1,10 @@
-=begin header
-   * Name: os
+=begin rdoc
+   * Name: sos
    * Description: OpenStack services and logs tool for Red Hat OSes familly
-   * URL: https://github.com/gildub/os
+   * URL: https://github.com/gildub/sos
    * Date: 29 Nov 2013
    * Author: Gilles Dubreuil <gilles@redhat.com>
-   * License: Copyright 2011, 2013 Gilles Dubreuil
-=end
-
-=begin rdoc
+   * License: GNU GPLv3
 =end
 
 require 'sos/services'
@@ -15,12 +12,12 @@ require 'sos/openstack'
 
 SYNTAX =
   %s{Usage:
-  os [-fr] list
-  os [-fr] logs    [<SERVICE>] ... [<SERVICE>]
-  os [-fr] restart [<SERVICE>] ... [<SERVICE>]
-  os [-fr] start   [<SERVICE>] ... [<SERVICE>]
-  os [-fr] satus   [<SERVICE>] ... [<SERVICE>]
-  os [-fr] stop    [<SERVICE>] ... [<SERVICE>]
+  os [-sr] list
+  os [-sr] logs    [<SERVICE>] ... [<SERVICE>]
+  os [-sr] restart [<SERVICE>] ... [<SERVICE>]
+  os [-sr] start   [<SERVICE>] ... [<SERVICE>]
+  os [-sr] satus   [<SERVICE>] ... [<SERVICE>]
+  os [-sr] stop    [<SERVICE>] ... [<SERVICE>]
   os help
 
 Options:
@@ -40,10 +37,10 @@ Commands:
 
 class Syntax
   def initialize(line)
-    @command   = ""
+    @command   = ''
     @options   = {
       :runlevel => 3,
-      :filter   => '/neutron|openstack/',
+      :selector   => '/neutron|openstack/',
       :all      => false }
     @arguments = []
 
@@ -51,9 +48,9 @@ class Syntax
       case line[0]
       when '-a', '--all'
         @options[:all] = true
-      when '-f', '--filter'
+      when '-s', '--selector'
         line.shift
-        @options[:filter] = line[0]
+        @options[:selector] = line[0]
       when '-r', '--run_level'
         line.shift
         @options[:runlevel] = line[0].to_i
@@ -67,26 +64,27 @@ class Syntax
       end
       line.shift
     end
+    self.usage unless @command
   end
 
   def run
-    @services = Services.new(@options[:filter], @options[:runlevel], OpenStack::LOGS)
+    @services = Services.new(@options[:selector], @options[:runlevel], @arguments, OpenStack::LOGS)
 
     case @command
     when /status/i, /start/i, /stop/i, /restart/i
-      @services.enabled.each do |service|
+      @services.get_enabled.each { |service|
         system("service #{service.name} #{@command}")
-      end
+      }
     when /logs/i
       logs = ''
-      @services.enabled.each do |service|
+      @services.get_enabled.each { |service|
         logs << service.logs.join(' ') + ' '
-      end
+      }
       exec("tail -f #{logs}") if logs
     when /list/i
-      @services.enabled.each do |service|
+      @services.get_enabled.each { |service|
         puts service.name
-      end
+      }
     when 'test'
       p self
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sos
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gilles Dubreuil