--- dao/DaoMqPump2/DaoMqPump2/Transport.cs 2014/05/16 18:15:03 2165 +++ dao/DaoMqPump2/DaoMqPump2/Transport.cs 2014/05/16 18:24:05 2166 @@ -9,6 +9,8 @@ using MySql.Data.MySqlClient; using System.Globalization; +using DaoCommon; + namespace DaoMqPump2 { public class Transport @@ -124,18 +126,18 @@ if (statusData.lastrunOk == true) { - statusData.lastOkTime = getNowString(); + statusData.lastOkTime = DaoUtil.getNowString(); if (statusData.counter != startCounter) { //Vi har transporteret beskeder - så gemmer vi lige transfer tidspunktet - statusData.lastTransferTime = getNowString(); + statusData.lastTransferTime = DaoUtil.getNowString(); } } else { addLogEntry(statusData.lastErrorMessage); - statusData.lastErrorTime = getNowString(); + statusData.lastErrorTime = DaoUtil.getNowString(); } } @@ -189,7 +191,7 @@ MySqlCommand updateCmd = new MySqlCommand(updateSql, sqlWriteConnection); int numrows = updateCmd.ExecuteNonQuery(); - translog.WriteLine(getNowString() + " " + msgString); + translog.WriteLine(DaoUtil.getNowString() + " " + msgString); if (numrows != 1) { @@ -290,7 +292,7 @@ string discarded_filename = getLogFilename(LogfileType.LogDiscarded); using (StreamWriter discardedlog = new StreamWriter(discarded_filename, true)) { - discardedlog.WriteLine(getNowString() + " " + msgString); + discardedlog.WriteLine( DaoUtil.getNowString() + " " + msgString ); } mqMgr.Commit();//fjern den afviste transaktion fra køen statusData.discardedCounter++; @@ -305,7 +307,7 @@ if (numrows == 1) { - translog.WriteLine(getNowString() + " " + msgString); + translog.WriteLine( DaoUtil.getNowString() + " " + msgString ); mqMgr.Commit(); statusData.counter++; @@ -462,26 +464,6 @@ return filename; } - public string getNowString() - { - DateTime now = DateTime.Now; - - return now.ToString("s"); - } - - /* no used any where used added here for reference/ just in case */ - private void sendErrorMail(string sub, string msg) - { - System.Net.Mail.MailMessage message = new System.Net.Mail.MailMessage(); - message.To.Add("thn@daoas.dk"); - message.Subject = "Error from DaoMqPump2: " + sub; - message.From = new System.Net.Mail.MailAddress("no-reply@daoas.dk"); - message.Body = msg; - - System.Net.Mail.SmtpClient smtp = new System.Net.Mail.SmtpClient("mail.dao.int"); - smtp.Send(message); - } - private bool validateSalt2Header(string salt2String) { if (salt2String.Length < 66) @@ -544,7 +526,7 @@ private void addLogEntry(string msg) { - msg = getNowString() + " " + msg; + msg = DaoUtil.getNowString() + " " + msg; lock (logEntries) { logEntries.AddFirst(msg);