zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 01:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

updated plugin

Browse Source
This commit is contained in:
jainish shah
2018-02-02 12:31:23 -08:00
parent ca27ebd8e5
commit 09824eff6c
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CloudFormation/artifactory-enterprise.json
View File

@@ -751,7 +751,7 @@
"import java.util.concurrent.TimeUnit\n", "import java.util.concurrent.TimeUnit\n",
"jobs {\n", "jobs {\n",
" clean(cron: \"0 0/1 * * * ?\") {\n", " clean(cron: \"0 * * * * ?\") {\n",
" def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService)\n", " def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService)\n",
" def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log)\n", " def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log)\n",
" artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers()\n", " artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers()\n",
@@ -769,15 +769,22 @@
" }\n", " }\n",
" def cleanInactiveArtifactoryServers() {\n", " def cleanInactiveArtifactoryServers() {\n",
" log.info \"Executing inactive artifactory servers cleaner plugin\"\n",
" List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers()\n", " List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers()\n",
" for (member in allMembers) {\n", " for (member in allMembers) {\n",
" def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat())\n", " def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat())\n",
" def noheartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()\n", " def noHeartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()\n",
" if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noheartbeat) {\n", " if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noHeartbeat) {\n",
" log.info \"Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to remove\"\n", " try {\n",
" artifactoryServersCommonService.removeServer(member.serverId)\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",
" }\n", " }\n",
" log.info \"No inactive servers found\"\n",
" }\n", " }\n",
"}\n" "}\n"
]]}, ]]},

20
Terraform/inactiveServerCleaner.groovy
View File

@@ -2,10 +2,11 @@ import org.artifactory.state.ArtifactoryServerState
import org.artifactory.storage.db.servers.service.ArtifactoryServersCommonService import org.artifactory.storage.db.servers.service.ArtifactoryServersCommonService
import org.artifactory.common.ConstantValues import org.artifactory.common.ConstantValues
import org.slf4j.Logger import org.slf4j.Logger
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
jobs { jobs {
clean(cron: "* 0/1 * * * ?") { clean(cron: "0 * * * * ?") {
def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService) def artifactoryServersCommonService = ctx.beanForType(ArtifactoryServersCommonService)
def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log) def artifactoryInactiveServerCleaner = new ArtifactoryInactiveServersCleaner(artifactoryServersCommonService, log)
artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers() artifactoryInactiveServerCleaner.cleanInactiveArtifactoryServers()
@@ -23,15 +24,22 @@ public class ArtifactoryInactiveServersCleaner {
} }
def cleanInactiveArtifactoryServers() { def cleanInactiveArtifactoryServers() {
log.info "Executing inactive artifactory servers cleaner plugin"
List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers() List<String> allMembers = artifactoryServersCommonService.getAllArtifactoryServers()
for (member in allMembers) { for (member in allMembers) {
def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat()) def heartbeat = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - member.getLastHeartbeat())
def noheartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt() def noHeartbeat = heartbeat > ConstantValues.haHeartbeatStaleIntervalSecs.getInt()
if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noheartbeat) { if (member.getServerState() == ArtifactoryServerState.UNAVAILABLE || noHeartbeat) {
log.info "Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to " + try {
"remove" log.info "Running inactive artifactory servers cleaning task, found ${member.serverId} inactive servers to " +
artifactoryServersCommonService.removeServer(member.serverId) "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"
} }
} }