diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-10 20:51:38 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-10 20:51:38 +0100 |
commit | 09d297a383b60cfdba6b6388cc54c9c8fa603e75 (patch) | |
tree | 38f2d131bcbb352717c6b7e65cb5fd397071239c /src/main/java/io/trygvis/esper/testing/core/jenkins | |
parent | 7838a06e5521db39aee8b3b87785fcb5e32cd7ad (diff) | |
download | esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.gz esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.bz2 esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.tar.xz esper-testing-09d297a383b60cfdba6b6388cc54c9c8fa603e75.zip |
o Fixing another bug in the unbreakable poller, stored one build too many in some progress objects too.
o Got the logback.xml + system properties combination to finally work.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/core/jenkins')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java index 6a7e1b4..f06b4e6 100755 --- a/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java +++ b/src/main/java/io/trygvis/esper/testing/core/jenkins/JenkinsBuildPoller.java @@ -27,14 +27,14 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui private final XmlParser xmlParser = new XmlParser(); public static void main(String[] args) throws Exception { + Config config = loadFromDisk("jenkins-build-poller"); + String pollerName = "jenkins_build"; String tableName = "jenkins_build"; String columnNames = JenkinsDao.JENKINS_BUILD; SqlF<ResultSet, JenkinsBuildDto> f = JenkinsDao.jenkinsBuild; TablePoller.NewRowCallback<JenkinsBuildDto> callback = new JenkinsBuildPoller(); - Config config = loadFromDisk("jenkins-build-poller"); - BoneCPDataSource dataSource = config.createBoneCp(); new TablePoller<>(pollerName, tableName, columnNames, some("array_length(users, 1) > 0"), f, callback).work(dataSource); @@ -44,6 +44,8 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui Daos daos = new Daos(c); final BuildDao buildDao = daos.buildDao; + logger.info("Processing Jenkins Build uuid={}", jenkinsBuild.uuid); + JenkinsJobDto jobDto = daos.jenkinsDao.selectJob(jenkinsBuild.job).get(); SqlOption<InputStream> jobXmlFileO = daos.fileDao.load(jobDto.file); @@ -87,6 +89,8 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui final JenkinsBuildXml jenkinsBuildXml = o.some(); + logger.info("Build details: number={}, url={}", jenkinsBuildXml.number, jenkinsBuildXml.url); + SqlOption<UUID> uuidBuildO = buildDao.findBuildByReference(jenkinsBuild.toRef()); UUID uuidBuild = uuidBuildO.getOrElse(new SqlP0<UUID>() { @@ -116,13 +120,12 @@ public class JenkinsBuildPoller implements TablePoller.NewRowCallback<JenkinsBui Uuid person = personO.get().uuid; - if (!insertedParticipants.add(person)) { + if (insertedParticipants.add(person)) { + logger.info("Created build participant, person={}", person); + buildDao.insertBuildParticipant(uuidBuild, person); + } else { logger.info("Participant already inserted, person={}", person); - continue; } - - logger.info("Created build participant, person={}", person); - buildDao.insertBuildParticipant(uuidBuild, person); } logger.info("Created build uuid={}, #participants={}, #knownPersons={}, #unknonwnPersons={}", uuidBuild, |