• Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Minor Minor
    • core
    • Jenkins 2.64

      When a administrative monitor is disabled, in the Manage Jenkins page the isActivated method is called before the isEnabled one, so e.g., if the computation of the activated state throws an error it will continue to do so even with the monitor disabled.

      This does not happen in the page decorated, which checks the state in the correct order.

          [JENKINS-44608] Effectively disable administrative monitors

          Code changed in jenkins
          User: Andres Rodriguez
          Path:
          core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
          core/src/main/java/jenkins/model/Jenkins.java
          core/src/main/resources/jenkins/model/Jenkins/manage.jelly
          http://jenkins-ci.org/commit/jenkins/ce07ccbcd74cb9954c54137af8268e00629f7363
          Log:
          JENKINS-44608 Don't check for monitor activation if it is disabled

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Andres Rodriguez Path: core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/resources/jenkins/model/Jenkins/manage.jelly http://jenkins-ci.org/commit/jenkins/ce07ccbcd74cb9954c54137af8268e00629f7363 Log: JENKINS-44608 Don't check for monitor activation if it is disabled

          Code changed in jenkins
          User: Andres Rodriguez
          Path:
          core/src/main/java/jenkins/model/Jenkins.java
          http://jenkins-ci.org/commit/jenkins/92e56fd3deb18042107656fcab8bd41df965fe52
          Log:
          JENKINS-44608 Add `@since` tag for new public API.

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Andres Rodriguez Path: core/src/main/java/jenkins/model/Jenkins.java http://jenkins-ci.org/commit/jenkins/92e56fd3deb18042107656fcab8bd41df965fe52 Log: JENKINS-44608 Add `@since` tag for new public API.

          Code changed in jenkins
          User: Daniel Beck
          Path:
          core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
          core/src/main/java/jenkins/model/Jenkins.java
          core/src/main/resources/jenkins/model/Jenkins/manage.jelly
          http://jenkins-ci.org/commit/jenkins/59ae1f69fc6e27f4d6dcc0106f681c0d420a5dff
          Log:
          Merge pull request #2909 from andresrc/JENKINS-44608

          JENKINS-44608 Don't check for monitor activation if it is disabled

          Compare: https://github.com/jenkinsci/jenkins/compare/aff0b925771e...59ae1f69fc6e

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Daniel Beck Path: core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/resources/jenkins/model/Jenkins/manage.jelly http://jenkins-ci.org/commit/jenkins/59ae1f69fc6e27f4d6dcc0106f681c0d420a5dff Log: Merge pull request #2909 from andresrc/ JENKINS-44608 JENKINS-44608 Don't check for monitor activation if it is disabled Compare: https://github.com/jenkinsci/jenkins/compare/aff0b925771e...59ae1f69fc6e

          Code changed in jenkins
          User: Andres Rodriguez
          Path:
          core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
          core/src/main/java/jenkins/model/Jenkins.java
          core/src/main/resources/jenkins/model/Jenkins/manage.jelly
          http://jenkins-ci.org/commit/jenkins/65def10f5aa67524aeb1294415ca8e17f7d2f5a5
          Log:
          JENKINS-44608 Don't check for monitor activation if it is disabled

          (cherry picked from commit ce07ccbcd74cb9954c54137af8268e00629f7363)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Andres Rodriguez Path: core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/resources/jenkins/model/Jenkins/manage.jelly http://jenkins-ci.org/commit/jenkins/65def10f5aa67524aeb1294415ca8e17f7d2f5a5 Log: JENKINS-44608 Don't check for monitor activation if it is disabled (cherry picked from commit ce07ccbcd74cb9954c54137af8268e00629f7363)

            andresrc Andres Rodriguez
            andresrc Andres Rodriguez
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: