flydata 0.0.1.2011102302 → 0.0.1.2011102303

data/VERSION

@@ -1 +1 @@
-0.0.1.2011102302
+0.0.1.2011102303

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.1.2011102302"
+  s.version = "0.0.1.2011102303"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2012-10-23"
+  s.date = "2012-10-24"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -31,10 +31,13 @@ Gem::Specification.new do |s|
     "lib/flydata/command/base.rb",
     "lib/flydata/command/crontab.rb",
     "lib/flydata/command/login.rb",
+    "lib/flydata/command/restart.rb",
     "lib/flydata/command/routine.rb",
     "lib/flydata/command/sender.rb",
     "lib/flydata/command/setlogdel.rb",
     "lib/flydata/command/setup.rb",
+    "lib/flydata/command/start.rb",
+    "lib/flydata/command/stop.rb",
     "lib/flydata/credentials.rb",
     "lib/flydata/cron.rb",
     "lib/flydata/flydata_crontab.sh",

data/lib/flydata/command/restart.rb

@@ -0,0 +1,10 @@
+module Flydata
+  module Command
+    class Restart < Base
+      def run
+        sender = Flydata::Command::Sender.new
+        sender.restart
+      end
+    end
+  end
+end

data/lib/flydata/command/sender.rb

@@ -54,7 +54,7 @@ module Flydata
         process_exist?
       end
       def process_exist?
-        process_count = `ps aux|grep -v grep|grep "\\.flydata/"|grep fluentd|wc -l`.to_i
+        process_count = `ps aux|grep -v grep|grep "\\.flydata/flydata\\.conf"|grep fluentd|wc -l`.to_i
         process_count > 0
       end
     end

data/lib/flydata/command/setlogdel.rb

@@ -60,6 +60,7 @@ module Flydata
         url = "/data_entries/#{data_entry['id']}"
         ret = flydata.put(url, param)
         raise 'Failed to update the log deletion setting.' unless ret['success']
+        Flydata::Command::Crontab.new.run if !data_entry['log_deletion']
         puts "Update succeeded!"
       end
     end

data/lib/flydata/command/setup.rb

@@ -68,6 +68,7 @@ module Flydata
       def create_log_entry(path, log_deletion)
         data_port = flydata.data_port.get
         flydata.data_entry.create(data_port_id: data_port['id'], log_path: path, log_deletion: log_deletion)
+        Flydata::Command::Crontab.new.run if log_deletion
         say("Process successfuly!") if flydata.response.code == 200
       end
       def more_entry?

data/lib/flydata/command/start.rb

@@ -0,0 +1,10 @@
+module Flydata
+  module Command
+    class Start < Base
+      def run
+        sender = Flydata::Command::Sender.new
+        sender.start
+      end
+    end
+  end
+end

data/lib/flydata/command/stop.rb

@@ -0,0 +1,10 @@
+module Flydata
+  module Command
+    class Stop < Base
+      def run
+        sender = Flydata::Command::Sender.new
+        sender.stop
+      end
+    end
+  end
+end

data/lib/flydata/flydata_crontab.sh

@@ -8,10 +8,12 @@ FLYDATA_HOME=~/".flydata"
 CRON_TMP_PATH="$FLYDATA_HOME/cron_list.tmp"
 CRON_BACKUP_PATH="$FLYDATA_HOME/cron_list.back"
 LOG_PATH="$FLYDATA_HOME/flydata_cron.log"
-ROUTINE_COMMAND="flydata routine >> $LOG_PATH 2>&1"
-#ROUTINE_COMMAND="bundle exec "~/"github/hapyrus/flydata/cli/bin/""flydata routine >> $LOG_PATH 2>&1"
-CRON_LINE='15 4 * * *'" $ROUTINE_COMMAND"
-#CRON_LINE='* * * * *'" $ROUTINE_COMMAND"
+ROUTINE_COMMAND="$FLYDATA_HOME/bin/flydata routine >> $LOG_PATH 2>&1"
+if [[ "$FLYDATA_API_HOST" != "" ]]; then
+  ROUTINE_COMMAND="export FLYDATA_API_HOST=$FLYDATA_API_HOST && $ROUTINE_COMMAND"
+fi
+#CRON_LINE='15 4 * * *'" $ROUTINE_COMMAND"
+CRON_LINE='* * * * *'" $ROUTINE_COMMAND"
 
 ARG=$1
 REMOVE_OPTION="-r"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2011102302
+  version: 0.0.1.2011102303
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -243,10 +243,13 @@ files:
 - lib/flydata/command/base.rb
 - lib/flydata/command/crontab.rb
 - lib/flydata/command/login.rb
+- lib/flydata/command/restart.rb
 - lib/flydata/command/routine.rb
 - lib/flydata/command/sender.rb
 - lib/flydata/command/setlogdel.rb
 - lib/flydata/command/setup.rb
+- lib/flydata/command/start.rb
+- lib/flydata/command/stop.rb
 - lib/flydata/credentials.rb
 - lib/flydata/cron.rb
 - lib/flydata/flydata_crontab.sh
@@ -272,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2729482979291273575
+      hash: 54477074292210707
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: