From 09824eff6c3ed8733bb1f3201da1e5907b95429d Mon Sep 17 00:00:00 2001
From: jainish shah <jainishshah@yahoo.com>
Date: Fri, 2 Feb 2018 12:31:23 -0800
Subject: [PATCH] updated plugin

---
 CloudFormation/artifactory-enterprise.json | 17 ++++++++++++-----
 Terraform/inactiveServerCleaner.groovy     | 22 +++++++++++++++-------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json
index ee693b4..f23260e 100644
--- a/CloudFormation/artifactory-enterprise.json
+++ b/CloudFormation/artifactory-enterprise.json
@@ -751,7 +751,7 @@
                   "import java.util.concurrent.TimeUnit\n",
 
                   "jobs {\n",
-                  "    clean(cron: \"0 0/1 * * * ?\") {\n",
+                  "    clean(cron: \"0 * * * * ?\") {\n",
                   "        def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService)\n",
                   "        def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log)\n",
                   "        artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers()\n",
@@ -769,15 +769,22 @@
                   "    }\n",
 
                   "    def cleanInactiveArtifactoryServers() {\n",
+                  "        log.info \"Executing inactive artifactory servers cleaner plugin\"\n",
                   "        List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers()\n",
                   "        for (member in allMembers) {\n",
                   "            def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat())\n",
-                  "            def noheartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()\n",
-                  "            if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noheartbeat) {\n",
-                  "                log.info \"Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to remove\"\n",
-                  "                artifactoryServersCommonService.removeServer(member.serverId)\n",
+                  "            def noHeartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()\n",
+                  "            if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noHeartbeat) {\n",
+                  "                try {\n",
+                  "                    log.info \"Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to \" +\n",
+                  "                            \"remove\"\n",
+                  "                    artifactoryServersCommonService.removeServer(member.serverId)\n",
+                  "                }catch (Exception e){\n",
+                  "                    log.error \"Error: Not able to remove ${member.serverId}, ${e.message}\"\n",
+                  "                }\n",
                   "            }\n",
                   "        }\n",
+                  "        log.info \"No inactive servers found\"\n",
                   "    }\n",
                   "}\n"
                 ]]},
diff --git a/Terraform/inactiveServerCleaner.groovy b/Terraform/inactiveServerCleaner.groovy
index 6f85566..883f2bd 100644
--- a/Terraform/inactiveServerCleaner.groovy
+++ b/Terraform/inactiveServerCleaner.groovy
@@ -2,10 +2,11 @@ import org.artifactory.state.ArtifactoryServerState
 import org.artifactory.storage.db.servers.service.ArtifactoryServersCommonService
 import org.artifactory.common.ConstantValues
 import org.slf4j.Logger
+
 import java.util.concurrent.TimeUnit
 
 jobs {
-    clean(cron: "* 0/1 * * * ?") {
+    clean(cron: "0 * * * * ?") {
         def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService)
         def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log)
         artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers()
@@ -23,15 +24,22 @@ public class ArtifactoryInactiveServersCleaner {
     }
 
     def cleanInactiveArtifactoryServers() {
+        log.info "Executing inactive artifactory servers cleaner plugin"
         List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers()
         for (member in allMembers) {
             def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat())
-            def noheartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()
-            if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noheartbeat) {
-                log.info "Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to " +
-                        "remove"
-                artifactoryServersCommonService.removeServer(member.serverId)
+            def noHeartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()
+            if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noHeartbeat) {
+                try {
+                    log.info "Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to " +
+                            "remove"
+                    artifactoryServersCommonService.removeServer(member.serverId)
+
+                }catch (Exception e){
+                    log.error "Error: Not able to remove ${member.serverId}, ${e.message}"
+                }
             }
         }
+        log.info "No inactive servers found"
     }
-}
+}
\ No newline at end of file