diff --git a/App/.vs/SERV_EMAIL/v15/.suo b/App/.vs/SERV_EMAIL/v15/.suo index 9613a45..1026694 100644 Binary files a/App/.vs/SERV_EMAIL/v15/.suo and b/App/.vs/SERV_EMAIL/v15/.suo differ diff --git a/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe b/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe index 55f61c4..8ebbcec 100644 Binary files a/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe and b/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe differ diff --git a/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb b/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb index 2a1bdb1..749a63b 100644 Binary files a/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb and b/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll index bfb0a03..ac1eeac 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb index e36fe27..880e53f 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll index 83b76de..944e4fb 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb index 6cc2765..f1a5740 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.xml b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.xml index 688fc25..62d8b0d 100644 --- a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.xml +++ b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.xml @@ -126,74 +126,100 @@ DigitalData.Modules.Database The Firebird connection to use A datatable containing the results if the command was executed successfully. Nothing otherwise. - + Executes a sql query resulting in a table of values. The query to execute A datatable containing the results if the command was executed successfully. Nothing otherwise. - + + + Executes a non-query command. + + The command to execute + The Firebird connection to use + True, if command was executed sucessfully. Otherwise false. + + + + Executes a non-query command. + + The command to execute + True, if command was executed sucessfully. Otherwise false. + + + + Executes a sql query resulting in a scalar value. + + The query to execute + The Firebird connection to use + The scalar value if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + The Firebird connection to use + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + Returns a datatable for a sql-statement sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - - - - Executes the passed sql-statement in asyncmode - - the sql statement - Optional Timeout - - - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout - Returns true if properly executed, else false - + Returns the scalarvalue Returns a datatable for a sql-statement - sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout + sqlcommand for datatable (select XYZ from TableORView) Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout Returns true if properly executed, else false - diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll index 59a48e9..2cc7b06 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb index 0253ab2..8fd5d3b 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.xml b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.xml index dc66ac9..214eb9d 100644 --- a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.xml +++ b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.xml @@ -24,7 +24,7 @@ DigitalData.Modules.Logging LogConfig - 0.0.0.7 + 0.0.1.0 02.10.2018 Module that writes file-logs to different locations: @@ -125,6 +125,13 @@ DigitalData.Modules.Logging True, if debug log will be written. False otherwise. + + + Returns Logs in Memory as List(Of String) if Debug is enabled + Returns an empty list if debug is disabled + + A list of log messages + Initializes a new LogConfig object with a logpath and optinally a filename-suffix. @@ -146,6 +153,11 @@ DigitalData.Modules.Logging The name of the class the logger belongs to An object of Logging.Logger + + + Clears the internal log + + Gets the fully qualified name of the class invoking the calling method, diff --git a/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Debug.log b/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Debug.log new file mode 100644 index 0000000..56e8607 --- /dev/null +++ b/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Debug.log @@ -0,0 +1,8 @@ +2019-09-18 08:50:16|frmMain|DEBUG >> AppConfig is located at: [E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\CONFIG_APP\bin\Debug\CONFIG_APP.exe.Config] +2019-09-18 08:50:17|clsWindream_allgemein|DEBUG >> sDD-VMX02-APS01 +2019-09-18 08:50:18|clsWindream_allgemein|DEBUG >> sDD-VMX02-APS01 +2019-09-18 08:50:18|clsWindream_allgemein|DEBUG >> windream-Server: 'sDD-VMX02-APS01' +2019-09-18 08:50:18|clsWindream_allgemein|DEBUG >> windream-UserName: 'DIGITALDATA.LOCAL\SchreiberM' +2019-09-18 08:50:18|clsWindream_allgemein|DEBUG >> Alles OK - Erfolgreich angemeldet und Session aufgebaut +2019-09-18 08:50:18|frmMain|DEBUG >> SQL-Server ConnString is [Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd] +2019-09-18 08:50:18|clsDatabase|DEBUG >> ReturnDatatable Command: select * from TBEMLP_CONFIG diff --git a/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Error.log b/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Error.log new file mode 100644 index 0000000..07df350 --- /dev/null +++ b/App/CONFIG_APP/bin/Debug/Log/2019-09-18-Email-Profiler - Config-Log-Error.log @@ -0,0 +1,5 @@ +2019-09-18 08:52:43|clsEmailIMAP|ERROR >> Ein Verbindungsversuch ist fehlgeschlagen, da die Gegenstelle nach einer bestimmten Zeitspanne nicht richtig reagiert hat, oder die hergestellte Verbindung war fehlerhaft, da der verbundene Host nicht reagiert hat 217.110.227.196:25 + bei System.Net.Sockets.TcpClient..ctor(String hostname, Int32 port) + bei S22.Imap.ImapClient.Connect(String hostname, Int32 port, Boolean ssl, RemoteCertificateValidationCallback validate) + bei S22.Imap.ImapClient..ctor(String hostname, Int32 port, String username, String password, AuthMethod method, Boolean ssl, RemoteCertificateValidationCallback validate) + bei DigitalData.EMLProfiler.clsEmailIMAP.FetchIMAPMessages(String Server, Int32 Port, String Username, String Password, String Inbox, Boolean IsTest) in E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\clsEmail.IMAP.vb:Zeile 57. diff --git a/App/CONFIG_APP/frmMain.Designer.vb b/App/CONFIG_APP/frmMain.Designer.vb index 70cb46d..9aeb60c 100644 --- a/App/CONFIG_APP/frmMain.Designer.vb +++ b/App/CONFIG_APP/frmMain.Designer.vb @@ -278,11 +278,16 @@ Partial Class frmMain Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton34 = New System.Windows.Forms.ToolStripButton() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.Label16 = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() + Me.chkDeleteMail = New System.Windows.Forms.CheckBox() + Me.txtMoveTo = New System.Windows.Forms.TextBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.txtInboxname = New System.Windows.Forms.TextBox() Me.Button6 = New System.Windows.Forms.Button() Me.PORT_INTextBox = New System.Windows.Forms.TextBox() Me.Button2 = New System.Windows.Forms.Button() - Me.txtInboxname = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() Me.txtTestmail = New System.Windows.Forms.TextBox() Me.Label12 = New System.Windows.Forms.Label() Me.btnsendtestmail = New System.Windows.Forms.Button() @@ -342,6 +347,7 @@ Partial Class frmMain Me.TBEMLP_HISTORYTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_HISTORYTableAdapter() Me.TBEMLP_CONFIGTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() + Me.chkS22 = New System.Windows.Forms.CheckBox() GUIDLabel = New System.Windows.Forms.Label() PROFILE_NAMELabel = New System.Windows.Forms.Label() POLL_TYPELabel = New System.Windows.Forms.Label() @@ -446,6 +452,7 @@ Partial Class frmMain CType(Me.BindingNavigator5, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator5.SuspendLayout() Me.TabPage3.SuspendLayout() + Me.GroupBox5.SuspendLayout() CType(Me.GridControl6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingNavigator6, System.ComponentModel.ISupportInitialize).BeginInit() @@ -2896,12 +2903,11 @@ Partial Class frmMain ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.GroupBox5) Me.TabPage3.Controls.Add(Me.Button6) Me.TabPage3.Controls.Add(PORT_INLabel) Me.TabPage3.Controls.Add(Me.PORT_INTextBox) Me.TabPage3.Controls.Add(Me.Button2) - Me.TabPage3.Controls.Add(Me.txtInboxname) - Me.TabPage3.Controls.Add(Me.Button1) Me.TabPage3.Controls.Add(Me.txtTestmail) Me.TabPage3.Controls.Add(Me.Label12) Me.TabPage3.Controls.Add(Me.btnsendtestmail) @@ -2942,6 +2948,77 @@ Partial Class frmMain Me.TabPage3.Text = "EMail-Konto Konfiguration" Me.TabPage3.UseVisualStyleBackColor = True ' + 'GroupBox5 + ' + Me.GroupBox5.Controls.Add(Me.chkS22) + Me.GroupBox5.Controls.Add(Me.Label16) + Me.GroupBox5.Controls.Add(Me.Button1) + Me.GroupBox5.Controls.Add(Me.chkDeleteMail) + Me.GroupBox5.Controls.Add(Me.txtMoveTo) + Me.GroupBox5.Controls.Add(Me.Label15) + Me.GroupBox5.Controls.Add(Me.txtInboxname) + Me.GroupBox5.Location = New System.Drawing.Point(374, 319) + Me.GroupBox5.Name = "GroupBox5" + Me.GroupBox5.Size = New System.Drawing.Size(457, 100) + Me.GroupBox5.TabIndex = 76 + Me.GroupBox5.TabStop = False + Me.GroupBox5.Text = "IMAP Test" + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Location = New System.Drawing.Point(125, 34) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(70, 13) + Me.Label16.TabIndex = 76 + Me.Label16.Text = "InBox-Name:" + ' + 'Button1 + ' + Me.Button1.Image = Global.CONFIG_APP.My.Resources.Resources.email_go + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button1.Location = New System.Drawing.Point(6, 20) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(117, 35) + Me.Button1.TabIndex = 68 + Me.Button1.Text = "TEST_IMAP" + Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button1.UseVisualStyleBackColor = True + ' + 'chkDeleteMail + ' + Me.chkDeleteMail.AutoSize = True + Me.chkDeleteMail.Location = New System.Drawing.Point(309, 35) + Me.chkDeleteMail.Name = "chkDeleteMail" + Me.chkDeleteMail.Size = New System.Drawing.Size(80, 17) + Me.chkDeleteMail.TabIndex = 75 + Me.chkDeleteMail.Text = "Lösche Mail" + Me.chkDeleteMail.UseVisualStyleBackColor = True + ' + 'txtMoveTo + ' + Me.txtMoveTo.Location = New System.Drawing.Point(203, 58) + Me.txtMoveTo.Name = "txtMoveTo" + Me.txtMoveTo.Size = New System.Drawing.Size(200, 21) + Me.txtMoveTo.TabIndex = 73 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(152, 61) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(49, 13) + Me.Label15.TabIndex = 74 + Me.Label15.Text = "MoveTo:" + ' + 'txtInboxname + ' + Me.txtInboxname.Location = New System.Drawing.Point(203, 31) + Me.txtInboxname.Name = "txtInboxname" + Me.txtInboxname.Size = New System.Drawing.Size(100, 21) + Me.txtInboxname.TabIndex = 69 + Me.txtInboxname.Text = "Inbox" + ' 'Button6 ' Me.Button6.Image = Global.CONFIG_APP.My.Resources.Resources.email_go @@ -2966,7 +3043,7 @@ Partial Class frmMain ' Me.Button2.Image = Global.CONFIG_APP.My.Resources.Resources.email_go Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(374, 321) + Me.Button2.Location = New System.Drawing.Point(377, 425) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(117, 35) Me.Button2.TabIndex = 70 @@ -2974,26 +3051,6 @@ Partial Class frmMain Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button2.UseVisualStyleBackColor = True ' - 'txtInboxname - ' - Me.txtInboxname.Location = New System.Drawing.Point(496, 294) - Me.txtInboxname.Name = "txtInboxname" - Me.txtInboxname.Size = New System.Drawing.Size(100, 21) - Me.txtInboxname.TabIndex = 69 - Me.txtInboxname.Text = "Inbox" - ' - 'Button1 - ' - Me.Button1.Image = Global.CONFIG_APP.My.Resources.Resources.email_go - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(373, 280) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(117, 35) - Me.Button1.TabIndex = 68 - Me.Button1.Text = "TEST_IMAP" - Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.UseVisualStyleBackColor = True - ' 'txtTestmail ' Me.txtTestmail.BackColor = System.Drawing.SystemColors.Control @@ -3378,7 +3435,7 @@ Partial Class frmMain Me.GroupBox4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox4.Location = New System.Drawing.Point(8, 122) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(1203, 396) + Me.GroupBox4.Size = New System.Drawing.Size(1203, 0) Me.GroupBox4.TabIndex = 68 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Test RegEx" @@ -3419,7 +3476,7 @@ Partial Class frmMain Me.txtResultRegEx.Location = New System.Drawing.Point(659, 49) Me.txtResultRegEx.Multiline = True Me.txtResultRegEx.Name = "txtResultRegEx" - Me.txtResultRegEx.Size = New System.Drawing.Size(538, 341) + Me.txtResultRegEx.Size = New System.Drawing.Size(538, 0) Me.txtResultRegEx.TabIndex = 69 ' 'txthtmlEmail @@ -3431,7 +3488,7 @@ Partial Class frmMain Me.txthtmlEmail.Location = New System.Drawing.Point(9, 49) Me.txthtmlEmail.Multiline = True Me.txthtmlEmail.Name = "txthtmlEmail" - Me.txthtmlEmail.Size = New System.Drawing.Size(538, 341) + Me.txthtmlEmail.Size = New System.Drawing.Size(538, 0) Me.txthtmlEmail.TabIndex = 67 Me.txthtmlEmail.Text = Global.CONFIG_APP.My.MySettings.Default.MyTestHTML ' @@ -3509,6 +3566,16 @@ Partial Class frmMain ' Me.TBEMLP_CONFIGTableAdapter.ClearBeforeFill = True ' + 'chkS22 + ' + Me.chkS22.AutoSize = True + Me.chkS22.Location = New System.Drawing.Point(6, 62) + Me.chkS22.Name = "chkS22" + Me.chkS22.Size = New System.Drawing.Size(44, 17) + Me.chkS22.TabIndex = 77 + Me.chkS22.Text = "S22" + Me.chkS22.UseVisualStyleBackColor = True + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3584,6 +3651,8 @@ Partial Class frmMain Me.BindingNavigator5.PerformLayout() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() + Me.GroupBox5.ResumeLayout(False) + Me.GroupBox5.PerformLayout() CType(Me.GridControl6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BindingNavigator6, System.ComponentModel.ISupportInitialize).EndInit() @@ -3859,4 +3928,10 @@ Partial Class frmMain Friend WithEvents PORT_INTextBox As TextBox Friend WithEvents lblDownloadPath As Label Friend WithEvents Button6 As Button + Friend WithEvents Label15 As Label + Friend WithEvents txtMoveTo As TextBox + Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents Label16 As Label + Friend WithEvents chkDeleteMail As CheckBox + Friend WithEvents chkS22 As CheckBox End Class diff --git a/App/CONFIG_APP/frmMain.vb b/App/CONFIG_APP/frmMain.vb index 074fa38..87acb90 100644 --- a/App/CONFIG_APP/frmMain.vb +++ b/App/CONFIG_APP/frmMain.vb @@ -669,8 +669,14 @@ Public Class frmMain Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click My.Settings.Save() Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text) + 'Logger.Debug($"PWis !{PWPlain}35452dd=") + Dim oResult + If chkS22.Checked Then + oResult = _emailIMAP.FetchIMAPMessages(EMAIL_SMTPTextBox.Text, PORT_INTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, txtInboxname.Text, True, chkDeleteMail.Checked, txtMoveTo.Text) + Else + oResult = _emailIMAP.FetchIMAPMessagesIsoft(EMAIL_SMTPTextBox.Text, PORT_INTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, txtInboxname.Text, True, chkDeleteMail.Checked, txtMoveTo.Text, Path.Combine(My.Application.Info.DirectoryPath, "Log") & "\IsoftLog.txt") + End If - Dim oResult = _emailIMAP.FetchIMAPMessages(EMAIL_SMTPTextBox.Text, PORT_INTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, txtInboxname.Text, True) If oResult = False Then MsgBox("Access Imap NOT successfull", MsgBoxStyle.Critical) @@ -828,4 +834,8 @@ Public Class frmMain End If End If End Sub + + Private Sub chkS22_CheckedChanged(sender As Object, e As EventArgs) Handles chkS22.CheckedChanged + + End Sub End Class diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe b/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe index 55f61c4..8ebbcec 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb b/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb index 2a1bdb1..749a63b 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache index 9ffde11..5d408d5 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache index 1bd8e01..9f46749 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache differ diff --git a/App/DigitalData.EMLProfiler/ClassCurrent.vb b/App/DigitalData.EMLProfiler/ClassCurrent.vb index 51841a9..f595d21 100644 --- a/App/DigitalData.EMLProfiler/ClassCurrent.vb +++ b/App/DigitalData.EMLProfiler/ClassCurrent.vb @@ -24,6 +24,7 @@ Public Class ClassCurrent Public Shared MAIL_USER As String = "" Public Shared MAIL_USER_PW As String = "" Public Shared MAIL_PORT As Integer = 995 + Public Shared MAIL_INBOX_NAME As String = "Inbox" Public Shared DT_POLL_PROCESS As DataTable Public Shared DT_STEPS As DataTable Public Shared DT_INDEXING_STEPS As DataTable diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll index ced2b54..bfd034e 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb index 3553bab..25bfe12 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll index 7f419e5..944e4fb 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb index bdff397..f1a5740 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.xml b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.xml index 688fc25..62d8b0d 100644 --- a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.xml +++ b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.xml @@ -126,74 +126,100 @@ DigitalData.Modules.Database The Firebird connection to use A datatable containing the results if the command was executed successfully. Nothing otherwise. - + Executes a sql query resulting in a table of values. The query to execute A datatable containing the results if the command was executed successfully. Nothing otherwise. - + + + Executes a non-query command. + + The command to execute + The Firebird connection to use + True, if command was executed sucessfully. Otherwise false. + + + + Executes a non-query command. + + The command to execute + True, if command was executed sucessfully. Otherwise false. + + + + Executes a sql query resulting in a scalar value. + + The query to execute + The Firebird connection to use + The scalar value if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + The Firebird connection to use + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + Returns a datatable for a sql-statement sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - - - - Executes the passed sql-statement in asyncmode - - the sql statement - Optional Timeout - - - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout - Returns true if properly executed, else false - + Returns the scalarvalue Returns a datatable for a sql-statement - sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout + sqlcommand for datatable (select XYZ from TableORView) Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout Returns true if properly executed, else false - diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll index c1c87e9..2cc7b06 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb index b301b62..8fd5d3b 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.xml b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.xml index dc66ac9..214eb9d 100644 --- a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.xml +++ b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.xml @@ -24,7 +24,7 @@ DigitalData.Modules.Logging LogConfig - 0.0.0.7 + 0.0.1.0 02.10.2018 Module that writes file-logs to different locations: @@ -125,6 +125,13 @@ DigitalData.Modules.Logging True, if debug log will be written. False otherwise. + + + Returns Logs in Memory as List(Of String) if Debug is enabled + Returns an empty list if debug is disabled + + A list of log messages + Initializes a new LogConfig object with a logpath and optinally a filename-suffix. @@ -146,6 +153,11 @@ DigitalData.Modules.Logging The name of the class the logger belongs to An object of Logging.Logger + + + Clears the internal log + + Gets the fully qualified name of the class invoking the calling method, diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb index 75bda6c..4adf2d4 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb @@ -18,38 +18,7 @@ Public Class clsEmailIMAP ' Logger.Info(e.Log) 'End Sub - 'Public Function TestIMAPLogin(Server As String, Port As Integer, Username As String, Password As String, Inbox As String) As Boolean - ' Logger.Debug("Testing Login to Server {0}:{1} with user {2}", Server, Port, Username) - - ' Try - ' Logger.Debug("Connecting...") - ' Using oClient As New S22.Imap.ImapClient(Server, Port, Username, Password, S22.Imap.AuthMethod.Login, True) - ' If Not oClient.Authed Then - ' Logger.Warn("Connected to server but authentication failed.") - ' Return False - ' End If - ' Logger.Debug("Connection successful") - - ' Logger.Debug("Fetching MessageIds..") - ' Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Inbox) - - ' Logger.Debug("Found {0} messages", oMessageIds.Count) - ' Logger.Debug("Fetching messages...") - - ' Dim oMessages As IEnumerable(Of Mail.MailMessage) = oClient.GetMessages(oMessageIds, False, Inbox) - ' Logger.Debug("Messages fetched") - - ' oClient.Dispose() - - ' Return True - ' End Using - ' Catch ex As Exception - ' Logger.Error(ex) - ' Return False - ' End Try - 'End Function - - Public Function FetchIMAPMessages(Server As String, Port As Integer, Username As String, Password As String, Inbox As String, Optional IsTest As Boolean = False) As Boolean + Public Function FetchIMAPMessages(Server As String, Port As Integer, Username As String, Password As String, Inbox As String, Optional IsTest As Boolean = False, Optional DeleteinTest As Boolean = False, Optional MoveMailTo As String = "") As Boolean Logger.Debug("Connecting to Server {0}:{1} with user {2}", Server, Port, Username) Try @@ -61,27 +30,50 @@ Public Class clsEmailIMAP End If Logger.Debug("Connection successful") - Logger.Debug("Fetching MessageIds..") + Logger.Debug($"Fetching unseen MessageIds from Inbox: {Inbox}") Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Inbox) Logger.Debug("Found {0} messages", oMessageIds.Count) Logger.Debug("Fetching messages...") For Each oMessageId As UInteger In oMessageIds + Logger.Debug($"Checking message") Dim oMessage = oClient.GetMessage(oMessageId, False, Inbox) + Logger.Debug($"Checking message Subject: {oMessage.Subject}, From: {oMessage.From}") + Dim oTempPath = Path.GetTempFileName() Dim oResult = WriteMessageToFile(oMessage, oTempPath) Dim oCount As Integer = 0 Dim oMsg As New Message(oTempPath) + oCount &= 1 If IsTest = False Then MAIL_LIST.Add(oMsg) Else - Logger.Info($"IMAP-Test Message#: {oCount} - Msgsubject is: {oMsg.Subject}") + Logger.Debug($"IMAP-Test Message#: {oCount} - Msgsubject is: {oMsg.Subject} - MsgMessageID is: {oMsg.MessageID}") Logger.Debug($"message correctly fetched. Mail has been downloaded to {oTempPath}") End If + Try + If DeleteinTest = True Then + Logger.Debug($"Message shall be deleted...") + oClient.DeleteMessage(oMessageId,) + Logger.Debug($"Message has been deleted!") + End If + Catch ex As Exception + Logger.Warn("Message could not be deleted: " & ex.Message) + End Try + Try + If MoveMailTo <> "" Then + Logger.Debug($"Moving to [{MoveMailTo}] is active...") + oClient.MoveMessage(oMessageId, MoveMailTo) + Logger.Debug($"Successfully moved!") + End If + + Catch ex As Exception + Logger.Warn("Message could not be moved: " & ex.Message) + End Try Try If IsTest = False Then File.Delete(oTempPath) @@ -92,8 +84,8 @@ Public Class clsEmailIMAP Logger.Warn("Temp file could not be deleted") End Try Next - - Logger.Debug("Messages fetched") + oClient.Expunge() + Logger.Debug("Finished Message-Fetch") End Using Return True Catch ex As Exception @@ -101,6 +93,78 @@ Public Class clsEmailIMAP Return False End Try End Function + Private Shared Sub OnWriteLog(ByVal sender As Object, ByVal e As WriteLogEventArgs) + Console.Write(e.Log) + End Sub + Public Function FetchIMAPMessagesIsoft(Server As String, Port As Integer, Username As String, Password As String, Inbox As String, Optional IsTest As Boolean = False, Optional DeleteinTest As Boolean = False, Optional MoveMailTo As String = "", Optional IsoftLog As String = "") + Try + Logger.Debug(String.Format("Working on IMAP_COLLECT Independentsoft...")) + Dim oClient As New Independentsoft.Email.Imap.ImapClient(Server, Port) + If IsoftLog <> "" Then + Dim iLogger As New Independentsoft.Email.Logger(IsoftLog) + AddHandler iLogger.WriteLog, AddressOf OnWriteLog + oClient.Logger = iLogger + End If + + oClient.EnableSsl = True + oClient.ValidateRemoteCertificate = False + oClient.Connect() + Try + oClient.Login(Username, Password, AuthenticationType.Login) + Catch ex As Exception + Try + oClient.Login(Username, Password, AuthenticationType.Ntlm) + Catch ex1 As Exception + Logger.Error(ex) + Return False + End Try + + End Try + Logger.Debug("Logged in...") + oClient.SelectFolder(Inbox) + Dim oEnvelopes As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() + Dim oCount As Integer = 0 + For i As Integer = 0 To oEnvelopes.Length - 1 + If Not IsNothing(oEnvelopes(i).Subject) Then + 'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then + Logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID) + If Not IsNothing(oMessage) Then + oCount += 1 + MAIL_LIST.Add(oMessage) + End If + Try + If DeleteinTest = True Then + Logger.Debug($"Message shall be deleted...") + oClient.Delete(oEnvelopes(i).UniqueID) + Logger.Debug($"Message has been marked as deleted!") + End If + Catch ex As Exception + Logger.Warn("Message could not be deleted: " & ex.Message) + End Try + Try + If MoveMailTo <> "" Then + Logger.Debug($"Moving to [{MoveMailTo}] is active...") + oClient.AddMessage(MoveMailTo, oMessage) + Logger.Debug($"Successfully moved!") + End If + + Catch ex As Exception + Logger.Warn("Message could not be moved: " & ex.Message) + End Try + End If + + Next + oClient.Expunge() + oClient.Disconnect() + ' Logger.Debug($"{oCount.ToString} messages will be worked..") + ' Logger.Debug("IMAP_COLLECT finished!") + Return True + Catch ex As Exception + Logger.Error(ex, "Unexpected Error in IMAP COLLECT Independentsoft:") + Return False + End Try + End Function ''' ''' Uses a private API from MailWriter to write a MailMessage to disk. @@ -126,40 +190,6 @@ Public Class clsEmailIMAP End Try End Function - - 'Public Function IMAP_COLLECT() - ' Try - ' Logger.Info(String.Format("Working on IMAP_COLLECT.....")) - ' Logger.Debug(String.Format("Working on IMAP_COLLECT.....")) - ' Dim oClient As New Independentsoft.Email.Imap.ImapClient(MAIL_SERVER, MAIL_PORT) - - ' oClient.ValidateRemoteCertificate = False - ' oClient.Connect() - ' oClient.Login(MAIL_USER, MAIL_USER_PW) - ' oClient.SelectFolder("Inbox") - ' Dim oEnvelopes As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() - ' Dim oCount As Integer = 0 - ' For i As Integer = 0 To oEnvelopes.Length - 1 - ' If Not IsNothing(oEnvelopes(i).Subject) Then - ' 'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then - ' Logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") - ' Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID) - ' If Not IsNothing(oMessage) Then - ' oCount += 1 - ' MAIL_LIST.Add(oMessage) - ' End If - ' 'End If - ' End If - ' Next - ' oClient.Disconnect() - ' Logger.Debug($"{oCount.ToString} messages will be worked..") - ' Logger.Debug("IMAP_COLLECT finished!") - ' Return True - ' Catch ex As Exception - ' Logger.Error(ex, "Unexpected Error in IMAP COLLECT:") - ' Return False - ' End Try - 'End Function 'Public Function TEST_IMAP_COLLECT(INBOXNAME As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String) ' Try ' Logger.Info(String.Format("Working on TEST_IMAP_COLLECT.....")) diff --git a/App/DigitalData.EMLProfiler/clsEmail.vb b/App/DigitalData.EMLProfiler/clsEmail.vb index 67c5f24..7bc2441 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.vb @@ -108,21 +108,18 @@ Public Class clsEmail Return True ElseIf CURRENT_POLL_TYPE = "IMAP" Then Try - Dim oClient As New ImapClient(MAIL_SERVER, MAIL_PORT) + 'Using oClient As New S22.Imap.ImapClient(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, S22.Imap.AuthMethod.Login, True) + ' Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, MAIL_INBOX_NAME) + ' For Each oMessageId As UInteger In oMessageIds + ' If oMessageId = msgid Then + ' Logger.Debug($"DELETE_EMAILMessage shall be deleted...") + ' oClient.DeleteMessage(oMessageId) + ' Logger.Debug($"DELETE_EMAILMessage has been deleted!") + ' End If + ' Next + ' oClient.Expunge() 'delete messages marked as deleted - oClient.ValidateRemoteCertificate = False - oClient.Connect() - oClient.Login(MAIL_USER, MAIL_USER_PW) - - oClient.SelectFolder("Inbox") - Dim oEnvelopes As Envelope() = oClient.ListMessages() - For i As Integer = 0 To oEnvelopes.Length - 1 - If oEnvelopes(i).MessageID = msgid Then - oClient.Delete(oEnvelopes(i).UniqueID) 'mark as deleted - End If - Next - oClient.Expunge() 'delete messages marked as deleted - oClient.Disconnect() + 'End Using Return True Catch ex As Exception Logger.Warn("Error in IMAP Delete: " & ex.Message) diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb index 4bf641d..5045d11 100644 --- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb +++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb @@ -20,8 +20,8 @@ Public Class clsWorkEmail Try Logger = LogConf.GetLogger MyLogger = LogConf - If LogConf.Debug = False Then - Logger.Info("Detail-Log is on") + If LogConf.Debug = True Then + Logger.Info("DEBUG Active") End If _email = New clsEmail(LogConf) _DB_MSSQL = New clsDatabase(LogConf, ConStr) @@ -36,19 +36,24 @@ Public Class clsWorkEmail End Try End Sub - Public Function WORK_MAIL(msg As Message) + Public Function WORK_MAIL(MyEmailMessage As Message) Try + + Logger.Debug($"Starting WORK_MAIL...") CURRENT_MAIL_BODY_ALL = "" CURRENT_MAIL_BODY_ANSWER1 = "" CURRENT_MAIL_BODY_Substr2 = "" - CURRENT_MAIL_MESSAGE = msg - CURRENT_MAIL_SUBJECT = msg.Subject.ToUpper + CURRENT_MAIL_MESSAGE = MyEmailMessage + CURRENT_MAIL_SUBJECT = MyEmailMessage.Subject.ToUpper + Logger.Debug($"Working on email from: {MyEmailMessage.From.EmailAddress}...") If IsNothing(CURRENT_MAIL_SUBJECT) Then CURRENT_MAIL_SUBJECT = "" + Else + Logger.Debug($"Subject: {CURRENT_MAIL_SUBJECT}...") End If - CURRENT_MAIL_FROM = msg.From.EmailAddress - + CURRENT_MAIL_FROM = MyEmailMessage.From.EmailAddress + Logger.Debug($"Working on email from : {CURRENT_MAIL_FROM}...") Dim oTempMailExists As Boolean = SAVE2TEMP() 'Checking wether Mail can be opened Dim oTempMailAccessible As Boolean = False @@ -63,10 +68,10 @@ Public Class clsWorkEmail MessageError = False If CURRENT_MAIL_SUBJECT.Contains("[PROCESSMANAGER]") Then PROCESS_MANAGER_IN() - ElseIf msg.Subject.Contains("[ADDI]") Then + ElseIf MyEmailMessage.Subject.Contains("[ADDI]") Then Else - Logger.Debug(String.Format("No relation configured for this email - Subject[{0}]", msg.Subject)) + Logger.Info(String.Format("No relation configured for this email - Subject[{0}]", CURRENT_MAIL_SUBJECT)) COMMON_EMAIL_IN() End If INSERT_HISTORY() diff --git a/App/DigitalData.EMLProfiler/clsWorker.vb b/App/DigitalData.EMLProfiler/clsWorker.vb index 5c0607a..88640f5 100644 --- a/App/DigitalData.EMLProfiler/clsWorker.vb +++ b/App/DigitalData.EMLProfiler/clsWorker.vb @@ -100,6 +100,7 @@ Public Class clsWorker MAIL_USER = row("EMAIL_USER") MAIL_USER_PW = row("EMAIL_PW") MAIL_PORT = row("PORT_IN") + MAIL_INBOX_NAME = "Inbox" Logger.Debug(String.Format("{0}-{1}", MAIL_FROM, MAIL_SERVER)) Dim PWPlain = _wrapper.DecryptData(MAIL_USER_PW) @@ -129,7 +130,7 @@ Public Class clsWorker Case "IMAP" 'pollresult = _emailIMAP.IMAP_COLLECT() ' 09.04.19: Use S22.Imap instead of IndependentSoft ImapClient - pollresult = _emailIMAP.FetchIMAPMessages(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, "Inbox") + pollresult = _emailIMAP.FetchIMAPMessagesIsoft(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_INBOX_NAME) End Select End If diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll index ced2b54..bfd034e 100644 Binary files a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll and b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb index 3553bab..25bfe12 100644 Binary files a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb and b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt index 566737d..97cc60d 100644 --- a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt +++ b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt @@ -1,3 +1,6 @@ +E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.Resources.resources +E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.GenerateResource.cache +E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CoreCompileInputs.cache E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.dll.config E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.pdb @@ -21,11 +24,7 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\NLog.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\S22.Imap.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb -E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.Resources.resources -E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.GenerateResource.cache -E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CoreCompileInputs.cache E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CopyComplete E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.pdb -E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbprojAssemblyReference.cache diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbprojAssemblyReference.cache b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbprojAssemblyReference.cache deleted file mode 100644 index 1027f16..0000000 Binary files a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbprojAssemblyReference.cache and /dev/null differ diff --git a/App/SERV_EMAIL/MyService.vb b/App/SERV_EMAIL/MyService.vb index 6ae7224..69de3cc 100644 --- a/App/SERV_EMAIL/MyService.vb +++ b/App/SERV_EMAIL/MyService.vb @@ -37,6 +37,7 @@ Public Class MyService Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!") Else If LOG_ERRORS_ONLY = False Then + Logger.Info("DEBUG ACTIVATED") MyLogger.Debug = True Else MyLogger.Debug = False diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll index ced2b54..1f36628 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb index 3553bab..76c372f 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll index 7f419e5..944e4fb 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb index bdff397..f1a5740 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.xml b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.xml index 688fc25..62d8b0d 100644 --- a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.xml +++ b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.xml @@ -126,74 +126,100 @@ DigitalData.Modules.Database The Firebird connection to use A datatable containing the results if the command was executed successfully. Nothing otherwise. - + Executes a sql query resulting in a table of values. The query to execute A datatable containing the results if the command was executed successfully. Nothing otherwise. - + + + Executes a non-query command. + + The command to execute + The Firebird connection to use + True, if command was executed sucessfully. Otherwise false. + + + + Executes a non-query command. + + The command to execute + True, if command was executed sucessfully. Otherwise false. + + + + Executes a sql query resulting in a scalar value. + + The query to execute + The Firebird connection to use + The scalar value if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + The Firebird connection to use + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + + + Executes a sql query resulting in a table of values. + + The query to execute + A datatable containing the results if the command was executed successfully. Nothing otherwise. + + Returns a datatable for a sql-statement sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - - - - Executes the passed sql-statement in asyncmode - - the sql statement - Optional Timeout - - - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout - Returns true if properly executed, else false - + Returns the scalarvalue Returns a datatable for a sql-statement - sqlcommand for datatable (select XYZ from TableORView) - Optional Timeout + sqlcommand for datatable (select XYZ from TableORView) Returns a datatable - - + Executes the passed sql-statement the sql statement - Optional Timeout Returns true if properly executed, else false - + Executes the passed sql-statement as Scalar the sql statement - Optional Timeout Returns true if properly executed, else false - diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll index c1c87e9..2cc7b06 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb index b301b62..8fd5d3b 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.xml b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.xml index dc66ac9..214eb9d 100644 --- a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.xml +++ b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.xml @@ -24,7 +24,7 @@ DigitalData.Modules.Logging LogConfig - 0.0.0.7 + 0.0.1.0 02.10.2018 Module that writes file-logs to different locations: @@ -125,6 +125,13 @@ DigitalData.Modules.Logging True, if debug log will be written. False otherwise. + + + Returns Logs in Memory as List(Of String) if Debug is enabled + Returns an empty list if debug is disabled + + A list of log messages + Initializes a new LogConfig object with a logpath and optinally a filename-suffix. @@ -146,6 +153,11 @@ DigitalData.Modules.Logging The name of the class the logger belongs to An object of Logging.Logger + + + Clears the internal log + + Gets the fully qualified name of the class invoking the calling method, diff --git a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe index 53c2866..633abe8 100644 Binary files a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe and b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe differ diff --git a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb index 4c381d9..d460772 100644 Binary files a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb and b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe index 53c2866..633abe8 100644 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe and b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb index 4c381d9..d460772 100644 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb and b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache index 81673ae..65dfc65 100644 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache and b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache differ