Scarab commit: svn commit: r11368 - branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java

Author: dabbous
Date: 2017-04-18 11:16:17-0700
New Revision: 11368

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java

Log:
Added log infos

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&pathrev=11368&r1=11367&r2=11368
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	2017-04-18 11:16:17-0700
@@ -260,6 +260,7 @@
         {
             List<AttributeValue> candidates = AttributeValuePeer.getAutocloseCandidates();
             Iterator<AttributeValue> iter = candidates.iterator();
+            int closed = 0;
             while(iter.hasNext())
             {
                 AttributeValue av = iter.next();
@@ -287,9 +288,10 @@
                 {
                     Date now = new Date();
                     Long issueTime = now.getTime() - mostRecentDate.getTime();
-                    checkAutoclose(av, issueTime);
+                    closed += checkAutoclose(av, issueTime);
                 }
             }
+            log.info("Autoclose managed " + closed + " Issues");
         }
         catch (TorqueException te)
         {
@@ -1150,7 +1152,7 @@
         return issueMap;
     }    
     
-    private void checkAutoclose(AttributeValue aval, long issueTime)
+    private int checkAutoclose(AttributeValue aval, long issueTime)
     {
 
         List<Object> autocloseInitialStates = Environment.getConfigurationValues("scarab.common.autoclose.states", null);
@@ -1171,13 +1173,12 @@
                     if(finalState == null)
                     {
                         log.error("checkAutoclose(): config attribute 'scarab.common.autoclose.finalstate' not defined");
-                        return;
+                        return 0;
                     }
 
                     AttributeValue aval2;
                     try {
                         Issue issue = aval.getIssue();
-
                         String username = Environment.getConfigurationProperty("scarab.common.autoclose.user", null);
                         ScarabUser user = null;
                         if (username != null)
@@ -1189,25 +1190,39 @@
                             user = issue.getCreatedBy();
                         }
 
+                        log.info("autoclose: issue " + issue.getUniqueId() + " set to state " + finalState + " by user " + username );
+
                         aval2 = AttributeValue.getNewInstance(aval.getAttributeId(), issue);
                         aval2.setValue(finalState);
 
                         HashMap<Integer,AttributeValue> newAttVals = new HashMap<Integer,AttributeValue>();
                         newAttVals.put(aval.getAttributeId(), aval2);
                         issue.setAttributeValues(null, newAttVals, null, user);
+                        return 1;
                     }
                     catch (TorqueException e) {
                         log.error("checkAutoclose(): Could not change State value", e);
-                        return;
+                        return 0;
                     } catch (ScarabException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
                 }
-                return;
+                else 
+                {
+                    Issue issue;
+                    try {
+                        issue = aval.getIssue();
+                        log.info("autoclose: issue " + issue.getUniqueId() + " fires in " + (period-issueTime)/1000 + " seconds" );
+                        return 1;
+                    } catch (TorqueException e) {
+                        e.printStackTrace();
+                    }                    
+                }
+                return 0;
             }
         }
-        return;
+        return 0;
     }
     
     /**

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=3230093