gri 10.0.5 → 10.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18b74441643b4d4919d26663b826f09ed5e79342
-  data.tar.gz: eecd64dcd712c1f52a9bbfc7ff7b4c21a32557ad
+  metadata.gz: 3e8b36dc97ced45aa0de1a72697dcd52ff48e555
+  data.tar.gz: d0b0fbdab14c4dcd5fc35b6c079d1ddd371a8bde
 SHA512:
-  metadata.gz: 6399065907869a2d48bac6d93dbf7b43f34782278a41b8f716d2599a84711b3c6fe852660d0dc78375dbaec570ab186b31dffcbb1adf1100e39d9ba365aacdca
-  data.tar.gz: 2efbd5d418c136348a4344dff121a4d2cd3d45e1cc215c455dc99efa9ba8cb5a72dd786689bca9c9a3c38771d9f8e731aa8a197ed0b2da828b988eecae549dda
+  metadata.gz: b0cee0365f9753f8792bd614d5e591af2ef0dc49440e3392c4d652541c8de4bd5b63fd4a4a196a40c21e12027b8c9542a1dcdd0dd50b7492263cc82fd37a98f5
+  data.tar.gz: 0a22e850b4dbe14f60a76edbadfebffadf929acc5f1ef7796cedcd4331a17ef994688dbf9d5512e6b9066d507fa6f3055bd9d5311c0972ac1d07866bb0970891

data/.drone.yml

@@ -1,7 +1,8 @@
-image: bradrydzewski/ruby:2.0.0
+image: drone:gri
 env:
   - TZ=Asia/Tokyo
+  - HOME=/
 script:
-  - sudo apt-get install rrdtool
+  - source /etc/profile.d/rbenv.sh; rbenv global 2.1
   - bundle install
   - bundle exec rake test

data/README.md

@@ -130,3 +130,11 @@ font        DEFAULT:0:IPAPGothic
 * option-if-host *PAT* *option*
 
   Option to be added to the default when the host name matches PAT (regexp). Multiple options can be specified.
+
+### Operations
+
+ * trad: in-service acl-permit update
+   * send SIGUSR1 to trad
+ * trad: graceful shutdown
+   * send SIGWINCH to trad
+

data/lib/fluent/plugin/out_gri.rb

@@ -25,17 +25,17 @@ module Fluent
 class GriOutput < BufferedOutput
   Plugin.register_output('gri', self)
 
-  config_param :gra_dir, :string, :default=>'/usr/local/gri/gra'
-
-  def configure conf
-    super
-  end
+  config_param :config_path, :string, :default=>'/usr/local/gri/gri.conf'
+  config_param :gra_dir, :string, :default=>nil
 
   def start
     super
     #::Log.init '/tmp/fluent.log'
-    GRI::Plugin.load_plugins []
-    GRI::Config.init
+    GRI::Config.init @config_path
+    root_dir = GRI::Config['root-dir'] ||= GRI::Config::ROOT_PATH
+    plugin_dirs = GRI::Config.getvar('plugin-dir') || [root_dir + '/plugin']
+    GRI::Plugin.load_plugins plugin_dirs
+    @gra_dir ||= GRI::Config['gra-dir'] || root_dir + '/gra'
   end
 
   def format tag, time, record

data/lib/gri/trad.rb

@@ -17,6 +17,7 @@ module GRI
       acls.push(/^127\.0\.0\.1$/)
       acls.push(/^::ffff:127\.0\.0\.1$/)
       acls.push(/^::1$/)
+      puts "acls: #{acls.join(',')}" if $debug
       acls
     end
 
@@ -79,6 +80,7 @@ module GRI
     end
 
     def run options={}
+      status = :init
       optparser = optparse options
       optparser.parse!
       Process.daemon true if options[:daemonize] and !$debug
@@ -91,12 +93,30 @@ module GRI
       Dir.mkdir log_dir unless File.exist? log_dir
       Log.init "#{log_dir}/#{optparser.program_name}.log"
 
+      Signal.trap(:USR1){
+        Log.info "reloading acls"
+        config = GRI::Config.init config_path
+        @acls = load_acls config
+      }
+
+      Signal.trap(:WINCH){
+        Log.info "going to shutdown"
+        status = :shutdown
+      }
+
       bind_address = options[:bind_address] || '0.0.0.0'
       port = options[:port] || 7079
       server_sock = TCPServer.new bind_address, port
       rs0 = [server_sock]
       params = {}
-      while true
+      status = :start
+      while status != :stop
+        if status == :shutdown and rs0.size == 1 and rs0[0].kind_of?(TCPServer)
+          Log.info "shutting down"
+          server_sock.close
+          status = :stop
+          next
+        end
         next unless (a = IO.select(rs0, nil, nil, 1))
         rs, = a
         for io in rs
@@ -105,7 +125,11 @@ module GRI
               sock = server_sock.accept
               peername = sock.peeraddr[2]
               peeraddr = sock.peeraddr[3]
-              if allowed?(@acls, peeraddr)
+              if status == :shutdown
+                sock.close
+                Log.info "#{peeraddr}: reject due to shutting down"
+                next
+              elsif allowed?(@acls, peeraddr)
                 puts "#{peeraddr}: accespt #{sock.object_id}" if $debug
               else
                 sock.close
@@ -146,6 +170,9 @@ module GRI
           end
         end
       end
+
+      Log.info "stopped"
+      exit 0
     end
 
     def optparse opts

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.5"
+  VERSION = "10.0.6"
 end

data/lib/gri/writer.rb

@@ -41,8 +41,10 @@ module GRI
       now = Time.now.to_i
       hrecords = {}
       updaters = {}
+      hosts = {}
       for record in records
         if (host = record['_host']) and (key = record['_key'])
+          hosts[host] = true
           if key == 'SYS'
             @sysinfos[host] = record
           else
@@ -77,6 +79,9 @@ module GRI
         Utils.update_ltsv_file path, '_key', h
       }
       updaters.each {|k, u| u.close}
+      hosts.each {|host,|
+        @sysinfos[host] ||= {'_host'=>host.dup, '_time'=>now, '_mtime'=>now}
+      }
     end
 
     def finalize

data/misc/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:centos6
+FROM centos:centos7
 
 # cron
 RUN yum install -y cronie
@@ -10,24 +10,21 @@ RUN yum install -y httpd
 # ruby
 RUN yum install -y rubygems
 RUN gem install gri --no-ri --no-rdoc
-RUN cp /usr/bin/grapher /var/www/cgi-bin/
+RUN cp /usr/local/bin/grapher /var/www/cgi-bin/
 
 # rrdtool
-RUN yum install -y wget cairo gettext pango tcp_wrappers-libs libdbi
-RUN yum install -y xorg-x11-fonts-Type1 ipa-gothic-fonts ipa-pgothic-fonts
-RUN (cd /tmp; wget http://pkgs.repoforge.org/rrdtool/rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)
-RUN (cd /tmp; rpm --nodeps -i rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)
+RUN yum install -y rrdtool
 
 # admin
 RUN useradd -u 10000 admin
 
 # setup
 RUN mkdir -p /usr/local/gri; chown admin /usr/local/gri
-RUN echo '*/5 * * * * admin /usr/bin/gri' >>/etc/crontab
+RUN echo '*/5 * * * * admin /usr/local/bin/gri' >>/etc/crontab
 RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+RUN echo '/usr/sbin/crond&&/usr/sbin/httpd 2>/dev/null&&while true; do /bin/bash; done' > /tmp/boot.sh
+CMD ["/bin/bash", "/tmp/boot.sh"]
 
-# sudo docker build -t gri -rm .
-# sudo docker run -p 10080:80 -v /somewhere/gri:/usr/local/gri:rw -i -t gri /bin/bash
-# bash# /etc/rc.d/init.d/crond start
-# bash# /etc/init.d/httpd start
-# bash# vi /usr/local/gri/gritab
+# sudo docker build -t gri .
+# sudo docker run -d -p 10080:80 -v /somewhere/gri:/usr/local/gri:rw -i -t gri
+# vi /somewhere/gri/gritab

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.5
+  version: 10.0.6
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack