cs-service 0.2.2 → 0.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606521c9d1281693930ffae5e433c9fa8dd99632
-  data.tar.gz: 881ebcc7a1d62086d00e288917fafb9d612bafb8
+  metadata.gz: 367e793d07e4406f41af23dcc22b08c60936b719
+  data.tar.gz: 354b5c95c030c2f361a54abdee7bc288d8d1d640
 SHA512:
-  metadata.gz: 2d33e7cf4252d4d6449d32dc6733a541bc07ec24aac6e7302b8ac2ec6ebc6f02cc12ebf66d7efe5133b6b57b9131b8520da0d106bf298ddfc1a46ed4a791f28a
-  data.tar.gz: bfda6d7bbd9545f01adaf5b30f6131bd7e4b5f1fa206ae75b1fba18b49458e66f566bfe1bb255cee9e0d99ee04b381559baf789aa9f678a62bb2a03d49029991
+  metadata.gz: e4a57b80bcd336ba1418b9c9ac78e9526858668c2423cc1f88415a7be811f12ba340a09fcb4d7b00e48d1489f5a0c37683c9f284e95c04386a272bcb2afb0c44
+  data.tar.gz: 5c203d1292de91607a356ec28733c6358ba015015d4f55e508bc42def51bda5a88864482468c03acc6bb4198924e0e83de93dc7c889b38b2aa14fe92898ef529

data/README.md

@@ -1,4 +1,4 @@
-# Cs::Service
+# cs-service
 
 cs-service 财说服务管理工具, 根据项目中的config/project.yml, 来启动相关服务
 
@@ -10,14 +10,18 @@ cs-service 财说服务管理工具, 根据项目中的config/project.yml, 来
 
 ## Commands:
 
-    cs-service env [ENV_NAME]  # 环境变量检查
-    cs-service eye ...ARGS     # 执行eye口令, 详细参考 cs-service eye
-    cs-service help [COMMAND]  # 帮助
-    cs-service info [NAME]     # 查看当前运行状态
-    cs-service load [FILE]     # 加载配置文件，为空时加载默认配置
-    cs-service quit            # 退出 cs-service
+    cs-service env [ENV_NAME]     # 环境变量检查
+    cs-service eye ...ARGS        # 执行eye口令, 详细参考 cs-service eye
+    cs-service help [COMMAND]     # 帮助
+    cs-service info [PROJECT]     # 查看当前运行状态
+    cs-service load               # 首次加载配置文件
+    cs-service quit               # 退出 cs-service
+    cs-service restart [PROJECT]  # 重启项目
+    cs-service start [PROJECT]    # 启动项目
+    cs-service stop [PROJECT]     # 停止项目
+    cs-service version            # 当前版本
 
-### Step1 检查配置是否生效
+### Step1 检查配置是否生效, 是否可以找到有效的配置文件
 
     $ cs-service env
     
@@ -25,14 +29,19 @@ cs-service 财说服务管理工具, 根据项目中的config/project.yml, 来
 
     $ cs-service load
     
-### Step3 如果环境设置正确，则启动项目
+### Step3 查看当前加载的项目状态
+
+    $ cs-service info
+    
+### Step4 如果环境设置正确，则启动项目
 
     $ cs-service start                      # 启动所有项目
+    
+    # 如果单独启动项目
     $ cs-service start web                  # 启动caishuo主站
     $ cs-service start rest_server          # 启动Rest Server
     $ cs-service start trading_server       # 启动Trading Server
 
-
 ## Development
 
     rake build

data/config/processes/project.rb

@@ -2,7 +2,7 @@ require 'hashie'
 # 启动项目
 def run_projects
   fetch_config_files(project_roots).each do |root_path|
-    project(root_path, ENV['RACK_ENV']||'development')
+    project(root_path, ENV['RACK_ENV'] || 'development')
   end
 end
 
@@ -23,6 +23,12 @@ def project(root_path, env = :development)
 
     process_puma(self, config[:puma]) if config[:puma]
     process_sneaker(self, config[:sneaker]) if config[:sneaker]
+
+    group :realtime do
+      process_realtime(self, pool: config[:realtime][:pool]) if config[:realtime][:pool]
+      process_rt_client(self) if config[:realtime][:rt_client]
+    end if config[:realtime]
+
     group :resque do
       process_scheduler(self) if config[:resque][:scheduler]
       process_worker(self, config[:resque][:worker]) if config[:resque][:worker]
@@ -42,7 +48,5 @@ end
 
 def fetch_config_files(project_roots = [])
   project_roots << ENV['CURRENT_PWD']
-  a = project_roots.compact.uniq.find_all{|project_root| Eye::Logger.info('='*100 + File.join(project_root, 'config', 'project.yml')); File.exist?(File.join(project_root, 'config', 'project.yml'))}
-  Eye::Logger.info('========='*100 + ENV['PWD'])
-  a
+  project_roots.compact.uniq.find_all{|project_root| Eye::Logger.info('='*100 + File.join(project_root, 'config', 'project.yml')); File.exist?(File.join(project_root, 'config', 'project.yml'))}
 end

data/config/processes/realtime.rb

@@ -1,18 +1,15 @@
-def process_realtime(proxy, queues)
-  queues.each do |market, num|
-    proxy.group "realtime_#{market}" do
-      (1..num).each do |i|
-        process("worker_#{market}_#{i}") do
-          daemonize true
-          pid_file "tmp/pids/realtime_worker_#{market}.#{i}.pid"
-          stdall 'log/realtime.log'
+def process_realtime(proxy, pool: {})
+  pool.each do |market, num|
+    (1..num).each do |i|
+      proxy.process("#{market}_#{i}") do
+        daemonize true
+        pid_file "tmp/pids/realtime_worker_#{market}.#{i}.pid"
+        stdall 'log/realtime.log'
 
-          env 'PIDFILE' => "tmp/pids/realtime_worker_#{market}.#{i}.pid",
-              'RACK_ENV' => RACK_ENV
+        env 'PIDFILE' => "tmp/pids/realtime_worker_#{market}.#{i}.pid"
 
-          start_command "bundle exec rake stock:realtime_#{market} --trace"
-        end
+        start_command "bundle exec rake stock:realtime_#{market} --trace"
       end
     end
   end
-end
+end

data/config/processes/rt_client.rb

@@ -0,0 +1,11 @@
+def process_rt_client(proxy)
+  proxy.process('rt_client') do
+    daemonize true
+    pid_file 'tmp/pids/rt_client.pid'
+    stdall 'log/realtime.log'
+
+    env 'PIDFILE' => 'tmp/pids/rt_client.pid'
+
+    start_command 'bundle exec rake rt_client:sync --trace'
+  end
+end

data/examples/project.yml

@@ -20,6 +20,14 @@ common: &default_settings
     # 需要启动的sneaker consumer
     queue:  "Trading::PmsConsumer,FeedConsumer,JpushConsumer,StockRealtimeConsumer"
 
+  # 是否开启realtime worker
+  realtime:
+    # 需要启动的realtime worker
+    queue:
+      shanghai: 1
+      shenzhen: 1
+      hk_us: 1
+
 
 development:
   <<: *default_settings

data/lib/cs/service/cli.rb

@@ -7,7 +7,7 @@ module Cs
     end
 
     # Cli
-    class Cli < Thor
+    class Cli < Thor # rubocop:disable ClassLength
       ENVS = %w(REST_SERVER_ROOT TRADING_SERVER_ROOT RAILS_ROOT RACK_ENV).freeze
       PROJECTS = %w( rest_server trading_server web).freeze
       CONFIG_FILES = {
@@ -19,8 +19,9 @@ module Cs
       desc 'load', '首次加载配置文件'
       method_option :force, type: :boolean, aliases: '-f', desc: '强制重新加载配置文件'
       def load_conf
+        invoke(:env)
         quit if options[:force]
-        run_eye("load #{File.join(HOME_PATH, 'config/caishuo.eye')}")
+        run_eye(:load, File.join(HOME_PATH, 'config/caishuo.eye'))
       end
 
       desc 'env [ENV_NAME]', '环境变量检查'
@@ -46,31 +47,33 @@ module Cs
 
       desc 'info [PROJECT]', '查看当前运行状态'
       def info(name = nil)
-        run_eye("info #{name}")
+        # invoke(:env)
+        run_eye(:info, name)
       end
-
-      desc 'start [PROJECT]', '启动项目'
-      def start(name = nil)
-        name ||= PROJECTS * ' '
-        run_eye("start #{name}")
-      end
-
-      desc 'stop [PROJECT]', '停止项目'
-      def stop(name = nil)
-        name ||= PROJECTS * ' '
-        run_eye("stop #{name}")
-      end
-
-      desc 'restart [PROJECT]', '重启项目'
-      def restart(name = nil)
-        name ||= PROJECTS * ' '
-        run_eye("restart #{name}")
+      map status: :info
+
+      {
+        start: '启动',
+        stop: '停止',
+        restart: '重启',
+        delete: '删除'
+      }.each do |command, name|
+        desc "#{command} PROJECT[,...]", "#{name}项目"
+        define_method(command) do |*projects|
+          projects = PROJECTS if projects == []
+          run_eye(command, *projects)
+        end
       end
 
       desc 'quit', '退出 cs-service'
       def quit
-        invoke(:stop)
-        run_eye('quit')
+        stop
+        run_eye(:quit)
+      end
+
+      desc 'log [PROJECT]', '查看日志'
+      def log(project = nil)
+        run_eye(:trace, project || PROJECTS)
       end
 
       desc 'help [COMMAND]', '帮助'
@@ -96,8 +99,9 @@ module Cs
         end
       end
 
-      def run_eye(args = '')
-        puts `CURRENT_PWD=#{current_root} eye #{args}`
+      def run_eye(command, *args)
+        ENV['CURRENT_PWD'] = current_root
+        ::Eye::Cli.new.send(command, *args)
       end
 
       # 查找有效的配置文件

data/lib/cs/service/version.rb

@@ -1,5 +1,5 @@
 module Cs
   module Service
-    VERSION = "0.2.2"
+    VERSION = "0.3.0.beta1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs-service
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.beta1
 platform: ruby
 authors:
 - wangchangming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -101,6 +101,7 @@ files:
 - config/processes/project.rb
 - config/processes/puma.rb
 - config/processes/realtime.rb
+- config/processes/rt_client.rb
 - config/processes/scheduler.rb
 - config/processes/sneaker.rb
 - config/processes/worker.rb
@@ -125,9 +126,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5