cs-service 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2856bc352649501e862a9da28f00082ddb073ec
-  data.tar.gz: a0c4bae9b9b5efd6d4e3a7b69d9742248afa47d3
+  metadata.gz: 68a3a808e4be8df60711d444aae302a3f9623a5f
+  data.tar.gz: c1b395f6d0e704454ee8c727e8af77457136f532
 SHA512:
-  metadata.gz: d268b88ce0ac759287303c50649c544285e9e8fe27efe4a549c6e726e3621bfc840c98d1bf6a6d5e8214e8261fc5b49fccf856360245cead28622c937d8a0443
-  data.tar.gz: eba8dea9fe2d86525efa9c801a9de3ba1823623e43a7e41ac452f06615177c3a889da0f7bdcf56f2cecf8737967cfe3215c0269bcf4e8a704625d745c1848b96
+  metadata.gz: 19e123ff7c164f9b50faee7f6c153b8c93698e7c7986ad852e433ffcac254ffdc1f12127bb1de7f3b8e034c1ffb371473258cfee893743a5a2c99979fed901be
+  data.tar.gz: 6679bfcafaab9900b51e4692d7bf625ebfdc2a9abbb84b355f5f9cfe064c4f608c239f4107afb2f0becaa02f6f3e09a7e53c2ac66fd47fd2953451d9aebce295

data/README.md

@@ -1,28 +1,35 @@
 # Cs::Service
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/cs/service`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+cs-service 财说服务管理工具
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install cs-service
 
-```ruby
-gem 'cs-service'
-```
+## Commands:
 
-And then execute:
+    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
 
-    $ bundle
+### Step1 加载配置
 
-Or install it yourself as:
+    $ cs-service load
 
-    $ gem install cs-service
+### Step2 检查配置是否生效
 
-## Usage
+    $ cs-service env
+    
+### Step3 如果环境设置正确，则启动项目
+
+    $ cs-service start                      # 启动所有项目
+    $ cs-service start web                  # 启动caishuo主站
+    $ cs-service start rest_server          # 启动Rest Server
+    $ cs-service start trading_server       # 启动Trading Server
 
-TODO: Write usage instructions here
 
 ## Development
 
@@ -37,5 +44,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/config/caishuo.eye

@@ -1 +1,2 @@
-Eye.load('processes/*.rb')
+Eye.load('processes/*.rb')
+run_projects

data/config/processes/project.rb

@@ -0,0 +1,48 @@
+require 'hashie'
+# 启动项目
+def run_projects
+  fetch_config_files(project_roots).each do |root_path|
+    project(root_path, ENV['RACK_ENV']||'development')
+  end
+end
+
+# 启动单独项目
+def project(root_path, env = :development)
+  config = load_config(root_path, env)
+  return unless config[:app_name]
+
+  Eye.application config[:app_name] do
+    env 'RAILS_ENV' => env,
+        'RACK_ENV' => env,
+        'RAILS_ROOT' => root_path,
+        'RACK_ROOT' => root_path
+
+    working_dir root_path
+
+    process_global_app(self)
+
+    process_puma(self, config[:puma]) if config[:puma]
+    process_sneaker(self, config[:sneaker]) if config[:sneaker]
+    group :resque do
+      process_scheduler(self) if config[:resque][:scheduler]
+      process_worker(self, config[:resque][:worker]) if config[:resque][:worker]
+    end if config[:resque]
+  end
+end
+
+private
+
+def project_roots
+  [ENV['REST_SERVER_ROOT'], ENV['TRADING_SERVER_ROOT'], ENV['RAILS_ROOT']]
+end
+
+def load_config(root_path, env = :development)
+  Hashie.symbolize_keys(YAML.load_file(File.join(root_path, 'config', 'project.yml'))[env.to_s])
+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
+end

data/config/processes/puma.rb

@@ -1,5 +1,8 @@
-def process_puma(proxy)
+def process_puma(proxy, workers: 2, threads: 8, cpu: 50, memory: 300)
   proxy.process :puma do
+    env 'THREADS' => threads,
+        'WORKERS' => workers
+
     daemonize true
     pid_file "tmp/pids/puma.pid"
     start_command "bundle exec puma -C config/puma.conf.rb --daemon"
@@ -7,8 +10,8 @@ def process_puma(proxy)
     stdall 'log/puma.log'
     
     monitor_children do
-      check :memory, below: 500.megabytes, times: 3
-      check :cpu, below: 50, times: 3
+      check :memory, below: memory, times: 3
+      check :cpu, below: cpu, times: 3
     end
   end
 end

data/config/processes/scheduler.rb

@@ -1,14 +1,13 @@
 def process_scheduler(proxy)
   proxy.process :scheduler do
-      daemonize true
-      pid_file 'tmp/pids/scheduler.pid'
-      stdall 'log/scheduler.log'
+    daemonize true
+    pid_file 'tmp/pids/scheduler.pid'
+    stdall 'log/scheduler.log'
 
-      env 'BACKGROUND' => 'yes',
-          'PIDFILE' => 'tmp/pids/scheduler.pid',
-          'RACK_ENV' => RACK_ENV,
-          'VERBOSE' => '1',
-          'NEWRELIC_ENABLE' => 'false'
-      start_command 'bundle exec rake environment resque:scheduler'
-    end
-end
+    env 'BACKGROUND' => 'yes',
+        'PIDFILE' => 'tmp/pids/scheduler.pid',
+        'VERBOSE' => '1',
+        'NEWRELIC_ENABLE' => 'false'
+    start_command 'bundle exec rake environment resque:scheduler'
+  end
+end

data/config/processes/sneaker.rb

@@ -1,16 +1,17 @@
-def process_sneaker(proxy, workers)
+def process_sneaker(proxy, queue: '')
+  return if queue.blank?
   proxy.process :sneaker do
     daemonize true
     pid_file "tmp/pids/sneakers.pid"
     stdall 'log/sneakers.log'
 
     env 'PIDFILE' => "tmp/pids/sneakers.pid",
-        'RACK_ENV' => RACK_ENV,
-        'WORKERS' => workers
+        'WORKERS' => queue
 
     start_command 'bundle exec rake sneakers:run'
 
+    use_leaf_child false
+
     monitor_children
   end
-
-end
+end

data/config/processes/worker.rb

@@ -1,5 +1,5 @@
-def process_worker(proxy, queues)
-  queues.map { |k, v| Array.new(v, k) }.flatten.each_with_index do |queue_name, index|
+def process_worker(proxy, pool: {default: 8})
+  pool.map { |k, v| Array.new(v, k) }.flatten.each_with_index do |queue_name, index|
     n = index + 1
     proxy.process "worker_#{n}" do
       daemonize true
@@ -7,7 +7,6 @@ def process_worker(proxy, queues)
       stdall 'log/resque.log'
 
       env 'PIDFILE' => "tmp/pids/worker#{n}.pid",
-          'RACK_ENV' => RACK_ENV,
           'QUEUE' => "@#{queue_name}",
           'TERM_CHILD' => n,
           'RESQUE_TERM_TIMEOUT' => 10,

data/cs-service.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor'
   spec.add_dependency 'eye'
+  spec.add_dependency 'hashie'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/cs/service/cli.rb

@@ -1,84 +1,130 @@
 require 'thor'
 module Cs
   module Service
-
     HOME_PATH = File.realpath(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
     class Eye < ::Eye::Cli
     end
 
+    # Cli
     class Cli < Thor
-
-      # CONFIG_FILE = 
-
-      desc 'load [FILE]', '加载配置文件，为空时加载默认配置'
-      def load_conf(file = nil)
-        run_eye("load #{file || File.join(HOME_PATH, 'config/caishuo.eye')}")
+      ENVS = %w(REST_SERVER_ROOT TRADING_SERVER_ROOT RAILS_ROOT RACK_ENV).freeze
+      PROJECTS = %w( rest_server trading_server web).freeze
+      CONFIG_FILES = {
+        web: ENV['RAILS_ROOT'],
+        trading_server: ENV['TRADING_SERVER_ROOT'],
+        rest_server: ENV['REST_SERVER_ROOT']
+      }
+
+      desc 'load', '首次加载配置文件'
+      method_option :force, type: :boolean, aliases: '-f', desc: '强制重新加载配置文件'
+      def load_conf
+        quit if options[:force]
+        run_eye("load #{File.join(HOME_PATH, 'config/caishuo.eye')}")
       end
 
-      desc 'check [ENV_NAME]', '环境变量检查'
+      desc 'env [ENV_NAME]', '环境变量检查'
       long_desc <<-LONGDESC
-        `cs-service check` 将打印出环境变量. \n
-        > $ cs-service check \n
-        > $ cs-service check REST_SERVER_ROOT \n
-        > $ cs-service check TRADING_SERVER_ROOT \n
+        请声明以下环境变量设置:\n
+        REST_SERVER_ROOT
+        TRADING_SERVER_ROOT
+        RAILS_ROOT
+        RACK_ENV
       LONGDESC
-      ENVS = %w{ REST_SERVER_ROOT TRADING_SERVER_ROOT RAILS_ROOT RACK_ENV RAILS_ENV }
-      def check(env_name = nil)
+      def env(env_name = nil)
         if env_name.nil?
-          ENVS.each do |e|
-            puts "#{e}=#{ENV[e]}"
-          end
+          print_env
         elsif ENV[env_name]
           puts "#{env_name}=#{ENV[env_name]}"
         else
-          puts "#{env_name} is blank"
+          say "#{env_name} is blank", :yellow
         end
+        say "\nConfig Files:"
+        fetch_config_files
+        say "详见 cs-service help env"
       end
 
-      desc 'info [NAME]', 'eye info'
+      desc 'info [PROJECT]', '查看当前运行状态'
       def info(name = nil)
         run_eye("info #{name}")
       end
 
-      desc 'quit', 'exit cs-service'
+      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}")
+      end
+
+      desc 'quit', '退出 cs-service'
       def quit
-        run_eye("quit")
+        invoke(:stop)
+        run_eye('quit')
       end
 
-      desc "help [COMMAND]", "Describe available commands or one specific command"
+      desc 'help [COMMAND]', '帮助'
       def help(command = nil, subcommand = false)
-        puts Motd.msg
+        say Motd.msg unless command
         super(command, subcommand)
       end
 
-      # %w{start stop restart info trace monitor unmonitor delete}.each do |command|
-      #   desc command, "same as eye #{command}"
-      #   define_method command do |args|
-      #     run_eye(args)
-      #   end
-      # end
-
-      desc 'eye ...ARGS', 'manage set of tracked repositories'
+      desc 'eye ...ARGS', '执行eye口令, 详细参考 cs-service eye'
       subcommand 'eye', Eye
 
-      # desc 'eye [ARGS]', 'run eye'
-      # def eye(args = nil)
-      #   run_eye(args)
-      # end
-
-
-
       private
 
+      def print_env
+        say("Env:  #{rack_env}", :green)
+        ENVS.each do |e|
+          puts "  #{e}=#{ENV[e]}"
+        end
+      end
+
       def run_eye(args = '')
-         puts `eye #{args}`
+        puts `CURRENT_PWD=#{current_root} eye #{args}`
       end
 
-    end
+      # 查找有效的配置文件
+      def fetch_config_files
+        config_files = CONFIG_FILES.values.compact.uniq.map do |file|
+          check_config_file(file)
+        end.compact
+        return config_files unless config_files == []
+        check_config_file(current_root).nil? ? [] : File.join(current_root, 'config', 'project.yml')
+      end
 
+      # 判断当个配置文件是否存在
+      def check_config_file(file_root)
+        file = File.join(file_root, 'config', 'project.yml')
+        if File.exist?(file)
+          say("Found: #{file}", :green)
+          file
+        else
+          say("Not Found: #{file}", :red)
+          nil
+        end
+      end
 
-    
+      # 当前root
+      def current_root
+        File.expand_path('.')
+      end
 
+      # 当前运行环境
+      def rack_env
+        ENV['RACK_ENV'] || 'development'
+      end
+    end
   end
-end
+end

data/lib/cs/service/motd.rb

@@ -26,7 +26,11 @@ module Cs
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
            佛祖保佑       永不死机
-           我佛慈悲       干掉bug!}
+           我佛慈悲       干掉bug!
+
+项目配置文件: config/project.yml
+
+}
 
       def self.msg
         MSG

data/lib/cs/service/version.rb

@@ -1,5 +1,5 @@
 module Cs
   module Service
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs-service
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - wangchangming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,9 @@ files:
 - Rakefile
 - bin/cs-service
 - config/caishuo.eye
+- config/env.rb
 - config/processes/global.rb
+- config/processes/project.rb
 - config/processes/puma.rb
 - config/processes/realtime.rb
 - config/processes/scheduler.rb