Create instance reports, with test server URL

Author: flaix

src/main/java/com/gitblit/instance/GitblitInstance.java

@@ -2,20 +2,29 @@
 
 import com.gitblit.IStoredSettings;
 import com.gitblit.manager.IRuntimeManager;
+import com.gitblit.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import static com.gitblit.utils.JsonUtils.sendJsonString;
+
 public class GitblitInstance
 {
     private final static String STATS_URL = "https://instats.gitblit.dev/hiitsme/";
+    private final static Logger LOG = LoggerFactory.getLogger(GitblitInstance.class);
 
     private IRuntimeManager runtimeManager;
 
     private String instanceId;
 
     private GitblitInstanceReport report;
 
+    private ScheduledExecutorService executor;
 
 
     /**
@@ -34,6 +43,7 @@ public void init(IRuntimeManager runtimeManager) {
         // Initialize ID
         GitblitInstanceId instanceId = new GitblitInstanceId(runtimeManager.getBaseFolder());
         this.instanceId = instanceId.getId().toString();
+        LOG.info(this.instanceId);
 
         GitblitInstanceStat instanceStat;
 
@@ -60,6 +70,15 @@ public void start()
         }
     }
 
+    public void stop()
+    {
+        if (this.executor != null && !this.executor.isShutdown() && !this.executor.isTerminated()) {
+            this.executor.shutdownNow();
+            System.out.println("Gitblit instance reporting task stopped.");
+        }
+    }
+
+
 
     /**
      * Determine if the reporting task should run.
@@ -80,8 +99,9 @@ boolean shouldRunReports()
 
         // Check if we are running in a test environment
         IStoredSettings settings = this.runtimeManager.getSettings();
-        if (! settings.getString("gitblit.testReportingURL", "").isEmpty()) {
+        if (! settings.getString("gitblit.testReportingUrl", "").isEmpty()) {
             // Force reporting to run overriding any test settings
+            LOG.debug("Enabled reporting to test server URL: {}", settings.getString("gitblit.testReportingUrl", ""));
             return true;
         }
         if (settings.getBoolean("gitblit.testRun", false)) {
@@ -119,17 +139,31 @@ private void startReports()
     {
         this.executor = Executors.newSingleThreadScheduledExecutor();
 
-        String baseUrl = STATS_URL;
+        String statsUrl = STATS_URL;
         int delay = 24;
         int period = 24 * 60; // 24 hours in minutes
         TimeUnit unit = TimeUnit.MINUTES;
+        long retryInterval = 60 * 60 * 1000; // 1 hour in milliseconds
+        final long retryTimeout = 20 * 60 * 60 * 1000; // 20 hours in milliseconds
+
+        // If we are running in a test environment, we will send the reports more frequently
+        String testUrl = this.runtimeManager.getSettings().getString("gitblit.testReportingUrl", "");
+        if (! testUrl.isEmpty()) {
+            statsUrl = testUrl;
+            delay = 10;
+            period = 24;
+            unit = TimeUnit.SECONDS;
+            retryInterval = 10 * 1000; // 10 seconds in milliseconds
+        }
 
+        final String baseUrl = statsUrl;
+        final long retryIntervalFinal = retryInterval;
         this.executor.scheduleAtFixedRate(new Runnable()
         {
             @Override
             public void run()
             {
-                sendMyStats(baseUrl + instanceId);
+                sendMyStats(baseUrl + instanceId, retryIntervalFinal, retryTimeout);
             }
         }, delay, period, unit);
     }
@@ -139,11 +173,40 @@ public void run()
      *
      * This will send a JSON object to the server with the instance report.
      *
-     * @param server
+     * @param reportUrl
      *            The URL to send the report to.
+     * @param retryInterval
+     *           The interval in milliseconds to wait before retrying to send the report if it failed.
+     * @param retryTimeout
+     *           The timeout in milliseconds to give up sending the report if it fails repeatedly.
      */
-    private void sendMyStats(String server)
+    private void sendMyStats(String reportUrl, long retryInterval, long retryTimeout)
     {
+        // Create a HTTP POST request payload
+        String report = JsonUtils.toJsonString(this.report.fromNow());
+
+        int status = 0;
+        long timeToGiveup = System.currentTimeMillis() + retryTimeout;
+        while (status != 200 && System.currentTimeMillis() < timeToGiveup) {
+            try {
+                status = sendJsonString(reportUrl, report, "gitblitta", "countmein".toCharArray());
+                if (status != 200) {
+                    LOG.debug("Error sending stats to " + reportUrl + ": " + status);
+                }
+            }
+            catch (IOException e) {
+                LOG.debug("Exception sending stats to " + reportUrl + ": " + e.getMessage());
+            }
+
+            if (status != 200) {
+                try {
+                    Thread.sleep(retryInterval);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return; // exit if interrupted
+                }
+            }
+        }
     }
 
 }

src/main/java/com/gitblit/instance/GitblitInstanceReport.java

@@ -2,6 +2,9 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
 /**
  * GitblitInstanceReport collects the static and dynamic statistics about a running
  * Gitblit instance, pairs it with a report version and instance id.
@@ -13,11 +16,28 @@ class GitblitInstanceReport
     private final int reportVersion = 1;
     @SerializedName("instance")
     private final String instanceId;
+    private final String startTs;
+    private String lpingTs;
+
     final GitblitInstanceStat instanceStat;
 
     GitblitInstanceReport(String instanceId, GitblitInstanceStat instanceStat)
     {
         this.instanceId = instanceId;
         this.instanceStat = instanceStat;
+
+        // Convert the timestamp taken from instanceStat to a string in the format "yyyy-MM-dd'T'HHmmssZ" so
+        // it can be used better in a file name. It is replicated here so that it can be directly used by the receiver.
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        this.startTs = dateFormat.format(instanceStat.startTs);
+    }
+
+    GitblitInstanceReport fromNow()
+    {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        this.lpingTs = dateFormat.format(System.currentTimeMillis());
+        return this;
     }
 }

src/main/java/com/gitblit/servlet/GitblitContext.java

@@ -310,6 +310,8 @@ protected void destroyContext(ServletContext context) {
 			}
 		}
 
+		this.instance.stop();
+
 		for (IManager manager : managers) {
 			logger.debug("stopping {}", manager.getClass().getSimpleName());
 			manager.stop();