Subversion Repositories DevTools

Rev

Rev 1363 | Rev 3897 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1363 Rev 1364
Line 117... Line 117...
117
      Else
117
      Else
118
         Is_Paused = False
118
         Is_Paused = False
119
      End If
119
      End If
120
   End If
120
   End If
121
End Function
121
End Function
-
 
122
 
-
 
123
'--------------------------------------------------------------------------------------------------------------------------
-
 
124
' Return True if the paramter values represent a disabled or paused daemon
-
 
125
Function Is_Disabled( astate)
-
 
126
   If astate = 1 Then           ' if build daemon paused
-
 
127
      Is_Disabled = True
-
 
128
   ElseIf astate = 2 Then       ' if build daemon disabled
-
 
129
      Is_Disabled = True
-
 
130
   Else
-
 
131
      Is_Disabled = False
-
 
132
   End If
-
 
133
End Function
-
 
134
 
122
'--------------------------------------------------------------------------------------------------------------------------
135
'--------------------------------------------------------------------------------------------------------------------------
123
' Convert daemon mode into a meaningful string
136
' Convert daemon mode into a meaningful string
124
Function Get_Daemon_Mode( nMode )
137
Function Get_Daemon_Mode( nMode )
125
   If nMode = "M" Then
138
   If nMode = "M" Then
126
      Get_Daemon_Mode = "Master"
139
      Get_Daemon_Mode = "Master"
Line 587... Line 600...
587
   if (document.getElementById('activeBuilds').checked)
600
   if (document.getElementById('activeBuilds').checked)
588
   {
601
   {
589
      new_url_query_string += ',activeBuilds';
602
      new_url_query_string += ',activeBuilds';
590
   }
603
   }
591
 
604
 
-
 
605
   if (document.getElementById('disabledDaemons').checked)
-
 
606
   {
-
 
607
      new_url_query_string += ',disabledDaemons';
-
 
608
   }
-
 
609
   
592
   // reload the page with the new query string
610
   // reload the page with the new query string
593
   var url = location.pathname + new_url_query_string;
611
   var url = location.pathname + new_url_query_string;
594
   window.location.assign(url);
612
   window.location.assign(url);
595
}
613
}
596
 
614
 
Line 670... Line 688...
670
                                             <input type="radio" name="displayfiltered" id="displayfiltered_off" value="OFF" <%=Display_Filtered("OFF")%> onclick="toggle_Display_Filtered('OFF')" >Off
688
                                             <input type="radio" name="displayfiltered" id="displayfiltered_off" value="OFF" <%=Display_Filtered("OFF")%> onclick="toggle_Display_Filtered('OFF')" >Off
671
                                             <input type="radio" name="displayfiltered" id="displayfiltered_on"  value="ON"  <%=Display_Filtered("ON")%>  onclick="toggle_Display_Filtered('ON')"  >On
689
                                             <input type="radio" name="displayfiltered" id="displayfiltered_on"  value="ON"  <%=Display_Filtered("ON")%>  onclick="toggle_Display_Filtered('ON')"  >On
672
                                          </td>
690
                                          </td>
673
                                          <td class="body_rowg">
691
                                          <td class="body_rowg">
674
                                             <input name="activeBuilds" id="activeBuilds" type="checkbox" <%=Filter_Checked("activeBuilds")%> value="activeBuilds" onclick='update_Display_Filter()'>Active Builds
692
                                             <input name="activeBuilds" id="activeBuilds" type="checkbox" <%=Filter_Checked("activeBuilds")%> value="activeBuilds" onclick='update_Display_Filter()'>Active Builds
-
 
693
                                             <input name="disabledDaemons"  id="disabledDaemons"  type="checkbox" <%=Filter_Checked("disabledDaemons")%>  value="disabledDaemons"  onclick='update_Display_Filter()'>Disabled Daemons
675
                                             <input name="problemDaemonSets"  id="problemDaemonSets"  type="checkbox" <%=Filter_Checked("problemDaemonSets")%>  value="problemDaemonSets"  onclick='update_Display_Filter()'>Problem Daemon Sets
694
                                             <input name="problemDaemonSets"  id="problemDaemonSets"  type="checkbox" <%=Filter_Checked("problemDaemonSets")%>  value="problemDaemonSets"  onclick='update_Display_Filter()'>Problem Daemon Sets
676
                                          </td>
695
                                          </td>
677
                                       </tr>
696
                                       </tr>
678
                                       <tr>
697
                                       <tr>
679
                                          <td class="body_rowg">
698
                                          <td class="body_rowg">
Line 760... Line 779...
760
                           Dim bRow_displayed            ' signals whether a row should be displayed or not
779
                           Dim bRow_displayed            ' signals whether a row should be displayed or not
761
                           Dim bRelease_link_displayed   ' indicates whether the release name has been rendered yet
780
                           Dim bRelease_link_displayed   ' indicates whether the release name has been rendered yet
762
                           Dim bDisplay_whole_set        ' forces the whole daemon set for a release to be displayed
781
                           Dim bDisplay_whole_set        ' forces the whole daemon set for a release to be displayed
763
                           Dim bDisplayFilterIsOn        ' Indicates if Filtering is on or off
782
                           Dim bDisplayFilterIsOn        ' Indicates if Filtering is on or off
764
                           Dim bShowProblemDaemonSets    ' Indicates if problem daemons must be shown during filtering
783
                           Dim bShowProblemDaemonSets    ' Indicates if problem daemons must be shown during filtering
-
 
784
                           Dim bShowDisabledDaemons      ' Indicates if a disabled daemon must be shown during filtering
765
                           Dim bShowActiveBuilds         ' Indicates if active builds must be shown during filtering
785
                           Dim bShowActiveBuilds         ' Indicates if active builds must be shown during filtering
766
 
786
 
767
                           ' Integer variables
787
                           ' Integer variables
768
                           Dim pkgId
788
                           Dim pkgId
769
                           Dim lastProjID                ' Used to detect project changes from one row to the next
789
                           Dim lastProjID                ' Used to detect project changes from one row to the next
Line 779... Line 799...
779
                           bRelease_link_displayed = False
799
                           bRelease_link_displayed = False
780
                           bDisplay_whole_set  = False
800
                           bDisplay_whole_set  = False
781
                           bDisplayFilterIsOn  = Display_Filter_Is_On()
801
                           bDisplayFilterIsOn  = Display_Filter_Is_On()
782
                           bShowProblemDaemonSets = Filter_Is_On("problemDaemonSets")
802
                           bShowProblemDaemonSets = Filter_Is_On("problemDaemonSets")
783
                           bShowActiveBuilds   = Filter_Is_On("activeBuilds")
803
                           bShowActiveBuilds   = Filter_Is_On("activeBuilds")
-
 
804
                           bShowDisabledDaemons = Filter_Is_On("disabledDaemons")
784
 
805
 
785
                           lastProjID = 0
806
                           lastProjID = 0
786
                           lastRtagId = 0
807
                           lastRtagId = 0
787
 
808
 
788
                           Do While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
809
                           Do While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
Line 836... Line 857...
836
 
857
 
837
                                 ' If the filter is turned on and master daemon is NOT actively building a package and it is NOT paused...
858
                                 ' If the filter is turned on and master daemon is NOT actively building a package and it is NOT paused...
838
                                 If bDisplayFilterIsOn _
859
                                 If bDisplayFilterIsOn _
839
                                    AND bShowProblemDaemonSets _
860
                                    AND bShowProblemDaemonSets _
840
                                    AND (NOT Is_Actively_Building(rsQry("current_pkg_id_being_built"))) _
861
                                    AND (NOT Is_Actively_Building(rsQry("current_pkg_id_being_built"))) _
841
                                    AND (NOT Is_Paused(rsQry("current_run_level"), bIndefinitelyPaused) ) Then
862
                                    AND (NOT Is_Paused(rsQry("current_run_level"), bIndefinitelyPaused) ) _
-
 
863
                                    AND (NOT Is_Disabled(daemonState) ) _
-
 
864
                                    Then
842
 
865
 
843
                                    ' Display the whole set if the master daemons delta exceeds the threshold
866
                                    ' Display the whole set if the master daemons delta exceeds the threshold
844
                                    bDisplay_whole_set = Daemon_Delta_Threshold_Exceeded(rsQry("delta"))
867
                                    bDisplay_whole_set = Daemon_Delta_Threshold_Exceeded(rsQry("delta"))
845
 
868
 
846
                                    ' If nothing appears wrong with the Master Daemon, look ahead at all the slaves in the set
869
                                    ' If nothing appears wrong with the Master Daemon, look ahead at all the slaves in the set
Line 857... Line 880...
857
                                          rtag_id_set_count = rtag_id_set_count + 1
880
                                          rtag_id_set_count = rtag_id_set_count + 1
858
 
881
 
859
                                          ' If this slave daemon is NOT actively building a package and it is NOT paused and its Delta exceeds the threshold...
882
                                          ' If this slave daemon is NOT actively building a package and it is NOT paused and its Delta exceeds the threshold...
860
                                          If (NOT Is_Actively_Building(rsQry("current_pkg_id_being_built"))) _
883
                                          If (NOT Is_Actively_Building(rsQry("current_pkg_id_being_built"))) _
861
                                             AND (NOT Is_Paused(rsQry("current_run_level"), bIndefinitelyPaused)) _
884
                                             AND (NOT Is_Paused(rsQry("current_run_level"), bIndefinitelyPaused)) _
-
 
885
                                             AND (NOT Is_Disabled(daemonState) ) _
862
                                             AND Daemon_Delta_Threshold_Exceeded(rsQry("delta")) Then
886
                                             AND Daemon_Delta_Threshold_Exceeded(rsQry("delta")) Then
863
 
887
 
864
                                             bDisplay_whole_set = True
888
                                             bDisplay_whole_set = True
865
                                          End If
889
                                          End If
866
                                          rsQry.MoveNext
890
                                          rsQry.MoveNext
Line 874... Line 898...
874
 
898
 
875
 
899
 
876
                              ' Now figure out if this row of data is to be displayed or not
900
                              ' Now figure out if this row of data is to be displayed or not
877
                              bRow_displayed  =   ( NOT bDisplayFilterIsOn ) _
901
                              bRow_displayed  =   ( NOT bDisplayFilterIsOn ) _
878
                                               OR ( bDisplay_whole_set ) _
902
                                               OR ( bDisplay_whole_set ) _
-
 
903
                                               OR ( bShowDisabledDaemons AND Is_Disabled(daemonState) ) _
879
                                               OR ( bShowActiveBuilds AND Is_Actively_Building(pkgId) )
904
                                               OR ( bShowActiveBuilds AND Is_Actively_Building(pkgId) )
880
 
905
 
881
 
906
 
882
                              ' If the release has changed and we are going to display this row, toggle the row style to give
907
                              ' If the release has changed and we are going to display this row, toggle the row style to give
883
                              ' it a slightly different look to the previous displayed row which was for a different release
908
                              ' it a slightly different look to the previous displayed row which was for a different release