Merge branch 'master' of C:\Users\Majid\source\repos\DDDCommon with c…

…onflicts.
hatami57 · Oct 1, 2019 · ce7fc1f · ce7fc1f
1 parent 9921ef7
commit ce7fc1f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 15 deletions.
diff --git a/Utils/SerilogPostgreSqlSink/ColumnWriterBase.cs b/Utils/SerilogPostgreSqlSink/ColumnWriterBase.cs
@@ -174,6 +174,25 @@ public override object GetValue(LogEvent logEvent, IFormatProvider formatProvide
             return str.Substring(1, str.Length - 2);
         }
     }
+
+    /// <summary>
+    /// Writes App name if exists
+    /// </summary>
+    public class AppColumnWriter : ColumnWriterBase
+    {
+        public AppColumnWriter(NpgsqlDbType dbType = NpgsqlDbType.Varchar) : base(dbType)
+        {
+        }
+
+        public override object GetValue(LogEvent logEvent, IFormatProvider formatProvider = null)
+        {
+            if (!logEvent.Properties.TryGetValue("RequestId", out var value))
+                return null;
+
+            var str = value.ToString();
+            return str.Substring(1, str.Length - 2);
+        }
+    }
 
     /// <summary>
     /// Writes log event as json

diff --git a/Utils/SerilogPostgreSqlSink/PostgreSqlSink.cs b/Utils/SerilogPostgreSqlSink/PostgreSqlSink.cs
@@ -132,25 +132,28 @@ private string GetFullTableName(string tableName, string schemaName)
 
         protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
         {
-            using (var connection = new NpgsqlConnection(_connectionString))
-            { 
-                await connection.OpenAsync();
-
-                if (!_isTableCreated)
+            try
+            {
+                using (var connection = new NpgsqlConnection(_connectionString))
                 {
-                    TableCreator.CreateTable(connection, _fullTableName, _columnOptions);
-                    _isTableCreated = true;
-                }
+                    await connection.OpenAsync();
 
-                if (_useCopy)
-                {
-                    ProcessEventsByCopyCommand(events, connection);
-                }
-                else
-                {
-                    await ProcessEventsByInsertStatements(events, connection);
+                    if (!_isTableCreated)
+                    {
+                        TableCreator.CreateTable(connection, _fullTableName, _columnOptions);
+                        _isTableCreated = true;
+                    }
+
+                    if (_useCopy)
+                        ProcessEventsByCopyCommand(events, connection);
+                    else
+                        await ProcessEventsByInsertStatements(events, connection);
                 }
             }
+            catch (Exception e)
+            {
+                Log.Error(e, "could not insert logs to PostgreSQL database");
+            }
         }
 
         private async Task ProcessEventsByInsertStatements(IEnumerable<LogEvent> events, NpgsqlConnection connection)