myreplicator 1.0.3 → 1.0.4

data/app/assets/javascripts/myreplicator/application.js

@@ -11,6 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
+//=require jquery-ui
 //= require jquery_ujs
 //= require_tree .
 $(function(){

data/app/assets/javascripts/myreplicator/cronwtf.js

@@ -127,10 +127,21 @@ var CronWTF = {
 
 var CronUI = {
   translate: function(){
-    var min = $("#min").val();
-    min_v = min == null ? '*' : this.process('#min',min) ;
-    var hr = $("#hour").val()
-    hr_v = hr == null ? '*' : this.process('#hour',hr) ;
+    if($("#cron-slider-trigger-min").attr("checked") != "checked"){
+      var min = $("#min").val();
+      min_v = min == null ? '*' : this.process('#min',min) ;
+    }else{
+      //grab from display as the lag between slider val assignment and the translation causes errors
+      var min = "*/"+$("#cron-n-min").text().replace(':',"")
+      min_v = min;
+    }
+    if($("#cron-slider-trigger-hr").attr("checked") != "checked"){
+      var hr = $("#hour").val()
+      hr_v = hr == null ? '*' : this.process('#hour',hr) ;
+    }else{
+      var hr = "*/"+$("#cron-n-hr").text().replace(':',"")
+      hr_v = hr;      
+    }
     var d = $("#day").val();
     d_v = d == null ? '*' : this.process('#day',d) ;
     var mon = $("#month").val();

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

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+
  *= require_tree .
  */
 @font-face{ 
@@ -241,6 +242,7 @@ form div.form-section {
   width:400px;
   float:left;
 }
+form div.form-section.right {width:450px;}
 
 form label {
   color:#474747;
@@ -261,10 +263,8 @@ form input {
 }
 
 form span.cron-label {
-  clear:left;
   color:#777;
-  display:block;
-  float:left;
+  display:inline-block;
   font-size:12px;
   font-weight:bold;
   line-height:30px;
@@ -416,7 +416,7 @@ table.data-grid td span.status { display:block; height:16px; width:16px;}
 table.data-grid td span.status.active {background:url(status.png) 50% 50% no-repeat;}
 table.data-grid td span.status.inactive {background:url(status-busy.png) 50% 50% no-repeat;}
 
-table.data-grid td a.action {color:#474747; display:block;font-weight:normal;float:left; line-height:16px; margin-right:20px; padding-left:20px; text-decoration:none;}
+table.data-grid td a.action {color:#474747; display:block;font-weight:normal; line-height:16px; margin-bottom:5px; padding-left:20px; text-decoration:none;}
 table.data-grid td a:hover {text-decoration:underline;}
 table.data-grid td a.view {background:url(clipboard-list.png) 0 50% no-repeat;}
 table.data-grid td a.edit {background:url(gear.png) 0 50% no-repeat;}
@@ -570,10 +570,7 @@ p.hint {color:#474747;font-size:12px;line-height:20px;margin:8px 5px;width:300px
   text-transform:capitalize;
 }
 
-table.overview {
-  width:100%;
-}
-
+table.overview { width:100%;}
 table.overview td {
   border-bottom:1px solid #eee;
   font-size:12px;
@@ -598,4 +595,62 @@ a.kill:before {
   padding-right:3px;
   font-size:14px;
 }
-a.kill:hover:before {color:#990000}
+a.kill:hover:before {color:#990000}
+
+.cron-option {height:50px;}
+.cron-option span.cron-label {vertical-align:top;}
+.cron-option .cron-select {
+  display:inline-block;
+  margin-right:10px;   
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;  
+  width:270px;
+}
+.cron-option .cron-select.trans {overflow:hidden;}
+.cron-option .cron-select.hide {margin:0px;width:0;}
+.cron-option label.n  { color:#777; display:inline-block; font-size:12px; font-weight:normal; vertical-align:top;}
+.cron-option label em {display:inline-block;min-width:18px;}
+.cron-option label input[type="checkbox"] {width:12px;margin-right:5px;}
+.cron-option .cron-slider {
+  display:inline-block; 
+  overflow:hidden;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+  vertical-align:top;
+  width:0px;
+}
+.cron-option .cron-slider.show {padding:5px 5px 5px 17px;width:250px;}
+.ui-slider { 
+  border-radius:999px;
+  box-shadow:inset 0 0 3px rgba(0,0,0,0.3);
+  width:200px;
+  position: relative; 
+  text-align: left; 
+  top:3px;
+}
+.ui-slider .ui-slider-handle {
+  background:url('slider_handle.png') 0 0 no-repeat; 
+  position: absolute; 
+  z-index: 2; width: 17px; height: 17px; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; height:15px; display: block; border: 0; }
+.ui-slider-horizontal { height: 13px; }
+.ui-slider-horizontal .ui-slider-handle { top: -2px;  margin-left:-8px; }
+.ui-slider-horizontal .ui-slider-range { 
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333', endColorstr='#666');
+  background:-moz-linear-gradient(top,  #333,  #666);
+  background:-o-linear-gradient(top,  #333,  #666);
+  background:-webkit-gradient(linear, left top, left bottom, from(#333), to(#666));  
+  border-radius:999px;  
+  -moz-box-shadow: inset 0 0 3px rgba(0,0,0,0.8);
+  -webkit-box-shadow: inset 0 0 3px rgba(0,0,0,0.8);
+  box-shadow: inset 0 0 3px rgba(0,0,0,0.8); 
+  top: 0; 
+  height: 100%; 
+
+}
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }

data/app/models/myreplicator/log.rb

@@ -57,14 +57,14 @@ module Myreplicator
     # Using PID
     ##
     def kill
+      return false unless hostname == Socket.gethostname
       begin
         Process.kill('TERM', pid)
         self.state = "killed"
         self.save!
       rescue Errno::ESRCH
         puts "pid #{pid} does not exist!"
-        self.state = "dead-pid"
-        self.save!
+        mark_dead
       end
     end
 
@@ -85,14 +85,54 @@ module Myreplicator
             puts "still running #{filepath}"
             return true
           rescue Errno::ESRCH
-            log.state = "error"
-            log.save!
+            log.mark_dead
+          end
+        end
+      end
+      
+      return false
+    end
+
+    ##
+    # Clear all logs marked running that are not running
+    ##
+    def self.clear_deads
+      logs = Log.where(:state => "running")
+  
+      if logs.count > 0
+        logs.each do |log|
+          begin
+            Process.getpgid(log.pid) if hostname == Socket.gethostname
+          rescue Errno::ESRCH
+            log.mark_dead
           end
         end
       end
       
+    end
+
+    ##
+    # Gets a jobtype, file and export_id
+    # returns true if the job is completed
+    ##
+    def self.completed? *args
+      options = args.extract_options!
+      log = Log.where(:export_id => options[:export_id],
+                      :file => options[:export_id],
+                      :job_type => options[:job_type]).last
+      if log.nil?
+        return true
+      else
+        return true if log.state != "running"
+      end
+      
       return false
     end
 
+    def mark_dead
+      self.state = "dead"
+      self.save!
+    end
+
   end
 end

data/app/views/myreplicator/exports/_form.html.erb

@@ -48,39 +48,72 @@ export_type = ["incremental","fulldump"]
   <option value="false" <% if @export.active == false %>SELECTED<% end %>>false</option>
 </select>
 </div>
-<div class="form-section">
+<div class="form-section right">
 <%= f.hidden_field :cron %>
 <label>Cron</label>
-<span class="cron-label">minutes:</span><select id="min" class="cron" multiple data-placeholder="Minutes">
-  <option value="*">*</option>
-<% (0..59).each do |n| %>
-  <option value="<%=n %>"><%= n%></option>
-<% end %>
-</select><br/>
-<span class="cron-label">hours:</span><select id="hour" class="cron" multiple data-placeholder="Hours">
-  <option value="*">*</option>
-<% (0..23).each do |n| %>
-  <option value="<%=n %>"><%= n%></option>
-<% end %>
-</select><br/>
-<span class="cron-label">days:</span><select id="day" class="cron" multiple data-placeholder="Days">
-  <option value="*">*</option>
-<% (1..31).each do |n| %>
-  <option value="<%=n %>"><%= n%></option>
-<% end %>
-</select><br/>
-<span class="cron-label">months:</span><select id="month" class="cron" multiple data-placeholder="Months">
-  <option value="*">*</option>
-<% (1..12).each do |n| %>
-  <option value="<%= n - 1%>"><%= Date::MONTHNAMES[n]%></option>
-<% end %>
-</select><br/>
-<span class="cron-label">weekday:</span><select id="dow" class="cron" multiple data-placeholder="Day of the Week">
-  <option value="*">*</option>
-<% (0..6).each do |n| %>
-  <option value="<%=n %>"><%= Date::DAYNAMES[n]%></option>
-<% end %>
-</select>
+<div class="cron-option">
+  <span class="cron-label">minutes:</span>
+  <div class="cron-select">
+    <select id="min" class="cron" multiple data-placeholder="Minutes">
+      <option value="*">*</option>
+    <% (0..59).each do |n| %>
+      <option value="<%=n %>"><%= n%></option>
+    <% end %>
+    </select>
+  </div>
+  <label class="n"><input type="checkbox" data-slider="cron-min" data-chosen="min" id="cron-slider-trigger-min"/>every <em id="cron-n-min">n:</em></label>
+  <div class="cron-slider">
+    <div id="cron-min"></div>
+  </div>
+</div>
+<div class="cron-option">
+  <span class="cron-label">hours:</span>
+  <div class="cron-select">
+    <select id="hour" class="cron" multiple data-placeholder="Hours">
+      <option value="*">*</option>
+    <% (0..23).each do |n| %>
+      <option value="<%=n %>"><%= n%></option>
+    <% end %>
+    </select>
+  </div>
+  <label class="n"><input type="checkbox" data-slider="cron-hr" data-chosen="hour" id="cron-slider-trigger-hr"/>every <em id="cron-n-hr">n:</em></label>
+  <div class="cron-slider">
+    <div id="cron-hr"></div>
+  </div>
+</div>
+<div class="cron-option">
+  <span class="cron-label">days:</span>
+  <div class="cron-select">
+    <select id="day" class="cron" multiple data-placeholder="Days">
+      <option value="*">*</option>
+    <% (1..31).each do |n| %>
+      <option value="<%=n %>"><%= n%></option>
+    <% end %>
+    </select>
+  </div>
+</div>
+<div class="cron-option">
+  <span class="cron-label">months:</span>
+  <div class="cron-select">
+    <select id="month" class="cron" multiple data-placeholder="Months">
+      <option value="*">*</option>
+    <% (1..12).each do |n| %>
+      <option value="<%= n - 1%>"><%= Date::MONTHNAMES[n]%></option>
+    <% end %>
+    </select>
+  </div>
+</div>    
+<div class="cron-option">
+  <span class="cron-label">weekday:</span>
+  <div class="cron-select">
+    <select id="dow" class="cron" multiple data-placeholder="Day of the Week">
+      <option value="*">*</option>
+    <% (0..6).each do |n| %>
+      <option value="<%=n %>"><%= Date::DAYNAMES[n]%></option>
+    <% end %>
+    </select>
+  </div>
+</div>
 <label style="clear:left">Cron synatx</label>
 <div id="cron-val"></div>
 <label>Cron translation</label>
@@ -112,6 +145,38 @@ $(function(){
     exportSchemaSelect($(this).val())
   });
   exportSchemaSelect($("#export_source_schema").val());
+  $("#cron-min").slider({
+    min: 1, 
+    max: 59,
+    range: "min",
+    slide: function(event,ui){
+      $("#cron-n-min").text(ui.value+":")
+      CronUI.translate();
+    }
+  });
+  $("#cron-hr").slider({
+    min: 1, 
+    max: 23,
+    range: "min",
+    slide: function(event,ui){
+      $("#cron-n-hr").text(ui.value+":")
+      CronUI.translate();
+    }
+  });  
+  $("label.n").find("input").click(function(e){
+    var box = $(this)
+    var val = $("#"+box.data("slider")).slider("value");
+    if(box.attr("checked") == "checked"){
+      box.parent("label").prev("div").addClass("trans").addClass("hide").end().next("div").addClass("show").end().find("em").text(val+":");
+      $("#"+box.data("chosen")).val("").trigger("liszt:updated");
+    }else{
+      box.parent("label").prev("div").removeClass("hide").end().next("div").removeClass("show").end().find('em').text("n:");
+      var d = box.parent("label").prev("div")
+      window.setTimeout(function(){d.removeClass('trans')},500)
+    }
+    CronUI.translate();
+  })
+
 <%- if @edit -%>
   editInit();
 <%- end -%>
@@ -123,7 +188,34 @@ function editInit(){
   var cron_vals = cron.split(" ");
   for(i=0;i<cron_vals.length; i++){
     //console.log(displays[i]+" val: "+cron_vals[i])
-    $(displays[i]).val(cron_vals[i]).trigger("liszt:updated");
+    //console.log(cron_vals[i].indexOf(","))
+    if(i < 2){
+      if(cron_vals[i].toString().charAt(1) == '/'){
+        if(displays[i] == "#min"){
+          var val = cron_vals[i].toString().split('/')[1];
+          $("#cron-slider-trigger-min").attr("checked","checked").parent("label").prev("div").addClass("trans").addClass("hide").end().next("div").addClass("show").end().find("em").text(val+":");
+          $("#cron-min").slider("value",val)
+        }else{
+          var val = cron_vals[i].toString().split('/')[1];
+          $("#cron-slider-trigger-hr").attr("checked","checked").parent("label").prev("div").addClass("trans").addClass("hide").end().next("div").addClass("show").end().find("em").text(val+":");
+          $("#cron-hr").slider("value",val)
+        }
+      }else{
+        if(cron_vals[i].indexOf(",") != -1){
+          var vals = cron_vals[i].split(',')
+          $(displays[i]).val(vals).trigger("liszt:updated");
+        }else{
+          $(displays[i]).val(cron_vals[i]).trigger("liszt:updated");
+        }
+      }
+    }else{
+        if(cron_vals[i].indexOf(",") != -1){
+          var vals = cron_vals[i].split(',')
+          $(displays[i]).val(vals).trigger("liszt:updated");
+        }else{
+          $(displays[i]).val(cron_vals[i]).trigger("liszt:updated");
+        }
+    }
   }
   CronUI.translate();
   $("#export_table_name").val("<%= @export.table_name %>").trigger("liszt:updated");

data/lib/loader/loader.rb

@@ -15,8 +15,11 @@ module Myreplicator
 
     ##
     # Main method provided for resque
+    # Reconnection provided for resque workers
     ##
     def self.perform
+      ActiveRecord::Base.verify_active_connections!
+      ActiveRecord::Base.connection.reconnect!
       load # Kick off the load process
     end
 
@@ -75,9 +78,12 @@ module Myreplicator
                   :name => "#{metadata.export_type}_import", 
                   :file => metadata.filename, 
                   :export_id => metadata.export_id) do |log|
-            
-            Loader.initial_load metadata
-            Loader.cleanup metadata
+
+            if Loader.transfer_completed? metadata
+              Loader.initial_load metadata
+              Loader.cleanup metadata
+            end
+
           end
         }
       end
@@ -100,9 +106,12 @@ module Myreplicator
                     :name => "incremental_import", 
                     :file => metadata.filename, 
                     :export_id => metadata.export_id) do |log|
-              
-              Loader.incremental_load metadata
-              Loader.cleanup metadata
+    
+              if Loader.transfer_completed? metadata
+                Loader.incremental_load metadata
+                Loader.cleanup metadata
+              end
+
             end
           end # group
         }
@@ -145,18 +154,17 @@ module Myreplicator
       exp = Export.find(metadata.export_id)
       Loader.unzip(metadata.filename)
       metadata.zipped = false
-
+      
       cmd = ImportSql.initial_load(:db => exp.destination_schema,
                                    :filepath => metadata.destination_filepath(tmp_dir))      
       puts cmd
-
+      
       result = `#{cmd}` # execute
       unless result.nil?
         if result.size > 0
           raise Exceptions::LoaderError.new("Initial Load #{metadata.filename} Failed!\n#{result}") 
         end
       end
-      
     end
 
     ##
@@ -170,14 +178,14 @@ module Myreplicator
       
       options = {:table_name => exp.table_name, :db => exp.destination_schema,
         :filepath => metadata.destination_filepath(tmp_dir)}
-
+      
       if metadata.export_type == "incremental_outfile"
         options[:fields_terminated_by] = ";~;"
         options[:lines_terminated_by] = "\\n"
       end
-
+      
       cmd = ImportSql.load_data_infile(options)
-
+      
       puts cmd
       
       result = `#{cmd}` # execute
@@ -189,6 +197,19 @@ module Myreplicator
       end
     end
 
+    ##
+    # Returns true if the transfer of the file
+    # being loaded is completed
+    ##
+    def self.transfer_completed? metadata
+      if Log.completed?(:export_id => metadata.export_id,
+                        :file => metadata.destination_filepath(tmp_dir),
+                        :job_type => "transporter")
+        return true
+      end
+      return false
+    end
+
     ##
     # Deletes the metadata file and extract
     ##