myreplicator 1.0.0 → 1.0.1

data/app/assets/stylesheets/myreplicator/application.css

@@ -585,3 +585,17 @@ table.overview tr:nth-child(even) {background:#fbfbfb;}
 table.overview tr:last-child td {border-bottom:0px;}
 table.overview td span.name {color:#474747;display:block;font-weight:bold; font-size:13px;padding-bottom:5px;}
 table.overview td span.file {color:#999;display:block;font-style:italic;}
+a.kill {
+  color:#474747;
+  display:block;
+  float:right;
+  text-decoration:none;
+  text-shadow:0 1px #fff;
+}
+a.kill:before {
+  content: '`';
+  font-family: 'WebSymbolsRegular';
+  padding-right:3px;
+  font-size:14px;
+}
+a.kill:hover:before {color:#990000}

data/app/controllers/myreplicator/exports_controller.rb

@@ -47,22 +47,18 @@ module Myreplicator
       @edit = true
 
       Myreplicator::Export.schedule_in_resque # schedule in resque
-
     end
   
     # POST /exports
     # POST /exports.json
     def create
       @export = Export.new(params[:export])
-
-      Myreplicator::Export.schedule_in_resque # schedule in resque
-
       @dbs = get_dbs
-
       respond_to do |format|
         if @export.save
           format.html { redirect_to @export, notice: 'Export was successfully created.' }
           format.json { render json: @export, status: :created, location: @export }
+          Myreplicator::Export.schedule_in_resque # schedule in resque
         else
           format.html { render action: "new" }
           format.json { render json: @export.errors, status: :unprocessable_entity }

data/app/controllers/myreplicator/home_controller.rb

@@ -21,6 +21,12 @@ module Myreplicator
       @exports = Export.where("error is not null").order('source_schema ASC')    
       @logs = Log.where(:state => 'error').order("started_at DESC") 
     end
+
+    def kill
+      @log = Log.find(params[:id])
+      @log.kill
+      redirect_to :action => 'index' 
+    end
     
   end
 end

data/app/models/myreplicator/export.rb

@@ -76,7 +76,7 @@ module Myreplicator
                                       :table => self.table_name)
       result = exec_on_source(sql)
 
-      return result.first.first
+      return result.first.first.to_s(:db)
     end
 
     def update_max_val(max_val = nil)

data/app/models/myreplicator/log.rb

@@ -68,7 +68,11 @@ module Myreplicator
     # Checks to see if the PID of the log is active or not
     ##
     def running?
-      logs = Log.where(:file => file, :job_type => job_type, :state => "running")
+      logs = Log.where(:file => file, 
+                       :job_type => job_type, 
+                       :state => "running",
+                       :export_id => export_id,
+                       :hostname => hostname)
   
       if logs.count > 0
         logs.each do |log|

data/app/views/myreplicator/home/index.html.erb

@@ -12,6 +12,7 @@
     <td><%= log.job_type %></td>
     <td><%= log.started_at.strftime("%Y-%m-%d %H:%M:%S") %></td>
     <td><%= chronos(@now.to_i - log.started_at.to_i) %></td>
+    <td><%= link_to 'kill job', kill_path(log), :class => 'kill'%></td>
   </tr>
   <% end %>
 </table>
@@ -31,5 +32,8 @@ jQuery(function(){
     link.addClass("on");
     jQuery(link.attr('href')).fadeIn().siblings("li").hide();
   })
+  $("a.kill").click(function(e){
+    if(confirm("Are you sure you wish to kill this running job?")!=true){e.preventDefault();}
+  })
 })
 </script>

data/config/routes.rb

@@ -2,4 +2,5 @@ Myreplicator::Engine.routes.draw do
   resources :exports
   root :to => "home#index"
   match '/errors', :to => "home#errors", :as => 'errors'
+  match '/kill/:id', :to => 'home#kill', :as => 'kill'
 end

data/lib/loader/loader.rb

@@ -32,7 +32,6 @@ module Myreplicator
 
       all_files.each do |m|
         if m.export_type == "initial"
-          Kernel.p m
           initials << m # Add initial to the list
           all_files.delete(m) # Delete obj from mixed list
 

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/transporter/transporter.rb

@@ -38,8 +38,8 @@ module Myreplicator
     # downloads export files concurrently from multiple sources
     ##
     def self.transfer
-      unique_jobs = Export.where("state != 'failed' and active = 1").group("source_schema")
-      
+      unique_jobs = Export.where("active = 1").group("source_schema")
+
       unique_jobs.each do |export|
         download export
       end
@@ -60,7 +60,7 @@ module Myreplicator
     ##
     def self.parallel_download export, ssh, files    
       p = Parallelizer.new(:klass => "Myreplicator::Transporter")
-      
+
       files.each do |filename|
         puts filename
         p.queue << {:params =>[ssh, export, filename], :block => download_file}
@@ -93,7 +93,7 @@ module Myreplicator
           sftp.download!(json_file, json_local_path)
           metadata = Transporter.metadata_obj(json_local_path)
           dump_file = metadata.export_path
-
+          puts metadata.state
           if metadata.state == "export_completed"
             Log.run(:job_type => "transporter", :name => "export_file",
                     :file => dump_file, :export_id => export.id) do |log|