diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb index b8f29bfd..cc915d02 100644 --- a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb +++ b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmLogin Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLogin)) Me.pnlLogin = New eXperDB.BaseControls.Panel() + Me.chkRememberPW = New eXperDB.BaseControls.CheckBox() Me.lblLoginName = New eXperDB.BaseControls.Label() Me.lblLogo = New eXperDB.BaseControls.Label() Me.lblLogo2 = New eXperDB.BaseControls.Label() @@ -43,7 +44,6 @@ Partial Class frmLogin Me.txtServerIP = New eXperDB.BaseControls.TextBox() Me.Panel3 = New eXperDB.BaseControls.Panel() Me.txtPassword = New eXperDB.BaseControls.TextBox() - Me.chkRememberPW = New eXperDB.BaseControls.CheckBox() Me.pnlLogin.SuspendLayout() Me.TableLayoutPanel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -76,6 +76,23 @@ Partial Class frmLogin Me.pnlLogin.Size = New System.Drawing.Size(379, 410) Me.pnlLogin.TabIndex = 7 ' + 'chkRememberPW + ' + Me.chkRememberPW.AutoSize = True + Me.chkRememberPW.BackColor = System.Drawing.Color.Transparent + Me.chkRememberPW.CheckFillColor = System.Drawing.Color.FromArgb(CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer)) + Me.chkRememberPW.ForeColor = System.Drawing.Color.LightSteelBlue + Me.chkRememberPW.LineColor = System.Drawing.Color.Gray + Me.chkRememberPW.Location = New System.Drawing.Point(249, 273) + Me.chkRememberPW.Name = "chkRememberPW" + Me.chkRememberPW.Radius = 10 + Me.chkRememberPW.Size = New System.Drawing.Size(108, 16) + Me.chkRememberPW.TabIndex = 11 + Me.chkRememberPW.Text = "Remember PW" + Me.chkRememberPW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.chkRememberPW.UnCheckFillColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.chkRememberPW.UseVisualStyleBackColor = False + ' 'lblLoginName ' Me.lblLoginName.FixedHeight = False @@ -353,23 +370,6 @@ Partial Class frmLogin Me.txtPassword.Text = "Password" Me.txtPassword.Value = "" ' - 'chkRememberPW - ' - Me.chkRememberPW.AutoSize = True - Me.chkRememberPW.BackColor = System.Drawing.Color.Transparent - Me.chkRememberPW.CheckFillColor = System.Drawing.Color.FromArgb(CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer)) - Me.chkRememberPW.ForeColor = System.Drawing.Color.LightSteelBlue - Me.chkRememberPW.LineColor = System.Drawing.Color.Gray - Me.chkRememberPW.Location = New System.Drawing.Point(249, 273) - Me.chkRememberPW.Name = "chkRememberPW" - Me.chkRememberPW.Radius = 10 - Me.chkRememberPW.Size = New System.Drawing.Size(108, 16) - Me.chkRememberPW.TabIndex = 11 - Me.chkRememberPW.Text = "Remember PW" - Me.chkRememberPW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.chkRememberPW.UnCheckFillColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.chkRememberPW.UseVisualStyleBackColor = False - ' 'frmLogin ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 12.0!) @@ -384,7 +384,7 @@ Partial Class frmLogin Me.Name = "frmLogin" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "1" + Me.Text = "Login" Me.pnlLogin.ResumeLayout(False) Me.pnlLogin.PerformLayout() Me.TableLayoutPanel1.ResumeLayout(False) diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx index 4f3e750d..9bf449b2 100644 --- a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx +++ b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmLogin.resx @@ -121,7 +121,7 @@ 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 index a02b59a8..19f2cd2f 100644 --- 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 index 87aa72cf..48be334a 100644 --- 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 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 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();