Merge pull request #54 from techman83/master

Small Archive Tweaks
KSP-CKAN · May 26, 2016 · 30b70e9 · 30b70e9
2 parents f3bb17f + e19cc39
commit 30b70e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/bin/mirror-ckan b/bin/mirror-ckan
@@ -114,6 +114,7 @@ sub yesterday {
         $mirror->upload_ckan($file);
       };
     }
+    sleep 1; # We're going to be checking 100s, lets not overwhelm the API
   }
 
   exit 0;

diff --git a/lib/App/KSP_CKAN/WebHooks.pm b/lib/App/KSP_CKAN/WebHooks.pm
@@ -55,15 +55,25 @@ post '/gh/:task' => sub {
   } 
 
   my @commits;
+  my $sender;
+  my $json;
   try {
-    @commits = @{from_json(request->body)->{commits}};
+    $json = from_json(request->body);
+    @commits = @{$json->{commits}};
+    $sender = $json->{sender}{login};
   };
 
   if ( $#commits == -1 && $task ne "release" ) {
     info("No commits received"); 
     return { "message" => "No add/remove commits received" };
   }
 
+  if ( defined $sender && $sender eq 'kspckan-crawler' ) {
+    info("Commits sent by crawler, skipping on demand mirror");
+    status(204);
+    return;
+  }
+
   if ( $task eq "inflate" ) {
     inflate_github(commits => \@commits);
   } elsif ( $task eq "mirror" ) {