Merge fba4c33 into f72944c

.travis.yml

@@ -8,8 +8,6 @@ env:
   - DB=sqlite
   - DB=postgres
 before_script:
-  - bundle exec bin/kaede dbus-policy $USER > kaede.conf
-  - sudo mv kaede.conf /etc/dbus-1/system.d/kaede.conf
   - psql -c "CREATE ROLE kaede WITH LOGIN" -U postgres
   - psql -c "CREATE DATABASE kaede_test WITH OWNER = kaede ENCODING = 'UTF-8' TEMPLATE = template0" -U postgres
 matrix:

README.md

@@ -24,7 +24,6 @@ Or install it yourself as:
 ### Requirements
 - SQLite3 or PostgreSQL
 - redis
-- dbus
 - recpt1
 - b25
 - [statvfs](https://github.com/eagletmt/eagletmt-recutils/tree/master/statvfs)
@@ -35,9 +34,6 @@ Some of them should be optional, though.
 
 ### Setup
 ```sh
-kaede dbus-policy $KAEDE_USER > kaede.conf
-sudo mv kaede.conf /etc/dbus-1/system.d/kaede.conf
-
 cp kaede.rb.sample kaede.rb
 vim kaede.rb
 gem install pg  # gem install sqlite3

kaede.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
   spec.add_dependency "fluent-logger"
+  spec.add_dependency "grpc"
   spec.add_dependency "nokogiri"
   spec.add_dependency "redis"
   spec.add_dependency "retryable", ">= 2.0.0"
-  spec.add_dependency "ruby-dbus"
   spec.add_dependency "sequel"
   spec.add_dependency "sleepy_penguin"
   spec.add_dependency "thor"

kaede.rb.sample

@@ -1,6 +1,10 @@
 require 'redis'
 require 'twitter'
 
+GRPC.extend(Logging.globally)
+Logging.logger.root.appenders = Logging.appenders.stdout
+Logging.logger.root.level = :debug
+
 Kaede.configure do |config|
   config.b25 = '/usr/bin/b25'
   config.recpt1 = '/usr/bin/recpt1'

lib/kaede/cli.rb

@@ -62,13 +62,6 @@ def update
       Kaede::Updater.new(db, syobocal).update
     end
 
-    desc 'dbus-policy USER', 'Generate dbus policy file'
-    def dbus_policy(user)
-      require 'kaede/dbus/generator'
-
-      puts DBus::Generator.new.generate_policy(user)
-    end
-
     desc 'db-prepare', 'Create tables'
     def db_prepare
       require 'kaede/database'

lib/kaede/config.rb

@@ -3,7 +3,7 @@
 
 module Kaede
   class Config
-    attr_accessor :database_url, :redis, :redis_queue, :fluent_tag_prefix, :fluent_host, :fluent_port
+    attr_accessor :database_url, :redis, :redis_queue, :fluent_tag_prefix, :fluent_host, :fluent_port, :grpc_port
 
     path_attrs = [:b25, :recpt1, :assdumper, :clean_ts, :statvfs, :record_dir, :cache_dir, :cabinet_dir]
     attr_reader *path_attrs
@@ -26,6 +26,7 @@ def initialize
       self.cabinet_dir = basedir.join('cabinet')
       self.redis = Redis.new
       self.redis_queue = 'jobs'
+      self.grpc_port = 'localhost:4195'
     end
   end
 end