Merge pull request #116 from experdb/development

[#no issue]
experdb · Nov 18, 2020 · 9c0a7ba · 9c0a7ba
2 parents 9340bd8 + 306f979
commit 9c0a7ba
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb
diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx
@@ -121,7 +121,7 @@
   <data name="lblLoginName.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAASAAAAAzCAYAAAA3ttUBAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAA3ySURBVHhe7Z1pjyZVFcf9QGDcEsF3/W4+wJC42xozGBIl
+        YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAA3ySURBVHhe7Z1pjyZVFcf9QGDcEsF3/W4+wJC42xozGBIl
         GjMdEAVRscdRCILIgELbglFRXJhhaJHgEjXGBYbNj1PWv546t84993+Xqq5n7fvil36qbt1zz13O/y7P
         0u+66T23NGeLD244zGcLy1e56b0bAPNrDlhZs9COp5abhfeBWzve/X7hQws+MDOtzSpAGw3zX8PynGFo
         gK0Y5tccsLJmoR1HWoSUAN3sBGgJItTbqwK0FbB6aFieMwgNsBXD/JoDVtZstGPIE6BehFrhmV2ExEbH

diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml b/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml
@@ -1676,6 +1676,7 @@ SELECT /* EXPERDBMABT_TABLE_INFO_001 24e9ab7301ff1966da4fb30dc1538882 */
 		   AND BAK.REG_DATE = ACM.REG_DATE
 		   AND BAK.ACTV_REG_SEQ = (SELECT MAX(X.ACTV_REG_SEQ) FROM TB_ACTV_COLLECT_INFO X WHERE X.REG_DATE = TO_CHAR(NOW(), 'YYYYMMDD') AND X.INSTANCE_ID=IST.INSTANCE_ID )
 		   AND BAK.ACTV_REG_SEQ = ACM.ACTV_REG_SEQ
+		   AND BAK.USER_NAME IS NOT NULL
 		   AND IST.INSTANCE_ID = ACM.INSTANCE_ID
 		GROUP BY BAK.REG_DATE,BAK.ACTV_REG_SEQ,ACM.INSTANCE_ID;
 		]]>

diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/src/experdb/mnt/task/TaskManager.java b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/src/experdb/mnt/task/TaskManager.java
@@ -77,22 +77,25 @@ public void run() {
 				//Instance 정보 변경 여부를 확인한다.
 				while(true) {
 					try {
-						Thread.sleep( 10 * 1000);
+						Thread.sleep( 1 * 1000);
 						session = sqlSessionFactory.openSession();
 						//Check the new cluster has been added. 
 						try {
-							HashMap<String, Object> checkReset = session.selectOne("system.TB_CHECK_SCALING_001");
-							if (checkReset != null){
-								int nCheckReset = Integer.parseInt(checkReset.get("need_apply").toString());
-								if (nCheckReset > 0)
-									log.info("The collector's status is not valid. now resetting the collector");
-									if (perform("restart") < 0)
-										log.info("Failed to reset the collector!");	
-									else
-										log.info("The collector reseting  complete!");
-									session.update("system.TB_CHECK_SCALING_U001");
-									session.commit();
-							}
+					        for(int i = 0 ; i < 9; i++){
+								HashMap<String, Object> checkReset = session.selectOne("system.TB_CHECK_SCALING_001");
+								if (checkReset != null){
+									int nCheckReset = Integer.parseInt(checkReset.get("need_apply").toString());
+									if (nCheckReset > 0)
+										log.info("The collector's status is not valid. now resetting the collector");
+										if (perform("restart") < 0)
+											log.info("Failed to reset the collector!");	
+										else
+											log.info("The collector reseting  complete!");
+										session.update("system.TB_CHECK_SCALING_U001");
+										session.commit();
+								}
+								Thread.sleep(1000);
+					        }	
 						} catch (Exception e) {
 							log.error("", e);
 							session.rollback();