Add instance name to serilog
This commit is contained in:
@@ -16,10 +16,11 @@ if (builder.Environment.IsProduction())
|
|||||||
{
|
{
|
||||||
builder.Host.UseSerilog((context, configuration) =>
|
builder.Host.UseSerilog((context, configuration) =>
|
||||||
{
|
{
|
||||||
|
var instanceName = context.Configuration["instanceName"] ?? "unknown";
|
||||||
configuration
|
configuration
|
||||||
.ReadFrom.Configuration(context.Configuration)
|
.ReadFrom.Configuration(context.Configuration)
|
||||||
.Enrich.FromLogContext()
|
.Enrich.FromLogContext()
|
||||||
.Enrich.WithProperty("Application", "DiunaBI")
|
.Enrich.WithProperty("Application", $"DiunaBI-{instanceName}")
|
||||||
.Enrich.WithProperty("Version", Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown")
|
.Enrich.WithProperty("Version", Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown")
|
||||||
.Enrich.WithEnvironmentName()
|
.Enrich.WithEnvironmentName()
|
||||||
.Enrich.WithMachineName();
|
.Enrich.WithMachineName();
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"SQLDatabase": "#{db-connection-string}#"
|
"SQLDatabase": "#{db-connection-string}#"
|
||||||
},
|
},
|
||||||
|
"InstanceName": "#{instance-name}",
|
||||||
"GoogleClientId": "#{google-backend-login-client-id}#",
|
"GoogleClientId": "#{google-backend-login-client-id}#",
|
||||||
"Secret": "#{google-backend-login-secret}#",
|
"Secret": "#{google-backend-login-secret}#",
|
||||||
"apiKey": "#{api-key}#",
|
"apiKey": "#{api-key}#",
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
###
|
###
|
||||||
GET http://localhost:5400/api/Layers/AutoImport/10763478CB738D4ecb2h76g803478CB738D4e/D1-
|
GET http://localhost:5400/api/Layers/AutoImport/10763478CB738D4ecb2h76g803478CB738D4e/K5-
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
DECLARE @JustForDebug TINYINT = 0;
|
DECLARE @JustForDebug TINYINT = 0;
|
||||||
|
|
||||||
-- SETUP VARIABLES
|
-- SETUP VARIABLES
|
||||||
DECLARE @Type NVARCHAR(3) = 'D1';
|
DECLARE @Type NVARCHAR(3) = 'FK2';
|
||||||
DECLARE @Month INT = 5;
|
DECLARE @Month INT = 7;
|
||||||
DECLARE @Year INT = 2025;
|
DECLARE @Year INT = 2025;
|
||||||
DECLARE @MonthName NVARCHAR(20) = 'Maj_2025';
|
DECLARE @MonthName NVARCHAR(20) = 'Lipiec_2025';
|
||||||
|
|
||||||
IF @Type NOT IN ('K5', 'PU', 'AK', 'FK', 'D1', 'FK2')
|
IF @Type NOT IN ('K5', 'PU', 'AK', 'FK', 'D1', 'FK2')
|
||||||
BEGIN
|
BEGIN
|
||||||
@@ -53,10 +53,10 @@ END;
|
|||||||
DECLARE @Plugin NVARCHAR(100);
|
DECLARE @Plugin NVARCHAR(100);
|
||||||
SET @Plugin =
|
SET @Plugin =
|
||||||
CASE @Type
|
CASE @Type
|
||||||
WHEN 'K5' THEN 'Morska.Process.T3.SingleSource'
|
WHEN 'K5' THEN 'Morska.Import.Standard'
|
||||||
WHEN 'PU' THEN 'Morska.Process.T3.SingleSource'
|
WHEN 'PU' THEN 'Morska.Import.Standard'
|
||||||
WHEN 'AK' THEN 'Morska.Process.T3.SingleSource'
|
WHEN 'AK' THEN 'Morska.Import.Standard'
|
||||||
WHEN 'FK' THEN 'Morska.Process.T3.SingleSource'
|
WHEN 'FK' THEN 'Morska.Import.Standard'
|
||||||
WHEN 'D1' THEN 'Morska.Import.D1'
|
WHEN 'D1' THEN 'Morska.Import.D1'
|
||||||
WHEN 'FK2' THEN 'Morska.Import.FK2'
|
WHEN 'FK2' THEN 'Morska.Import.FK2'
|
||||||
ELSE NULL -- If @Type doesn't match, set it to NULL
|
ELSE NULL -- If @Type doesn't match, set it to NULL
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
DECLARE @JustForDebug TINYINT = 0;
|
DECLARE @JustForDebug TINYINT = 0;
|
||||||
|
|
||||||
-- SETUP VARIABLES
|
-- SETUP VARIABLES
|
||||||
DECLARE @Month INT = 6;
|
DECLARE @Month INT = 7;
|
||||||
DECLARE @Year INT = 2025;
|
DECLARE @Year INT = 2025;
|
||||||
|
|
||||||
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
||||||
@@ -64,3 +64,11 @@ VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be
|
|||||||
INSERT INTO [diunabi-morska].[dbo].[Records]
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
VALUES ((SELECT NEWID()), 'DynamicCode-0', '[1001]=[9000]+[9005]-[9006]', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
VALUES ((SELECT NEWID()), 'DynamicCode-0', '[1001]=[9000]+[9005]-[9006]', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T3.MultiSourceSummary', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Priority', '80', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
-- T3-SingleSource
|
-- T3-SingleSource
|
||||||
|
|
||||||
DECLARE @JustForDebug TINYINT = 1;
|
DECLARE @JustForDebug TINYINT = 0;
|
||||||
|
|
||||||
-- SETUP VARIABLES
|
-- SETUP VARIABLES
|
||||||
DECLARE @Type NVARCHAR(3) = 'FK';
|
DECLARE @Type NVARCHAR(3) = 'K5';
|
||||||
DECLARE @Month INT = 6;
|
DECLARE @Month INT = 7;
|
||||||
DECLARE @Year INT = 2025;
|
DECLARE @Year INT = 2025;
|
||||||
|
|
||||||
IF @Type NOT IN ('K5', 'PU', 'AK', 'FK')
|
IF @Type NOT IN ('K5', 'PU', 'AK', 'FK')
|
||||||
@@ -68,3 +68,11 @@ VALUES ((SELECT NEWID()), 'Year', @Year, GETDATE(), GETDATE(), '117be4f0-b5d1-41
|
|||||||
INSERT INTO [diunabi-morska].[dbo].[Records]
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T3.SingleSource', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Priority', '100', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ DECLARE @JustForDebug TINYINT = 0;
|
|||||||
|
|
||||||
-- SETUP VARIABLES
|
-- SETUP VARIABLES
|
||||||
DECLARE @Type NVARCHAR(3) = 'FK2';
|
DECLARE @Type NVARCHAR(3) = 'FK2';
|
||||||
DECLARE @Month INT = 6;
|
DECLARE @Month INT = 7;
|
||||||
DECLARE @Year INT = 2025;
|
DECLARE @Year INT = 2025;
|
||||||
|
|
||||||
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
||||||
@@ -62,3 +62,11 @@ VALUES ((SELECT NEWID()), 'Year', @Year, GETDATE(), GETDATE(), '117be4f0-b5d1-41
|
|||||||
INSERT INTO [diunabi-morska].[dbo].[Records]
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T4.SingleSource', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|
||||||
|
INSERT INTO [diunabi-morska].[dbo].[Records]
|
||||||
|
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
|
||||||
|
VALUES ((SELECT NEWID()), 'Priority', '100', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ DECLARE @JustForDebug TINYINT = 0;
|
|||||||
-- SETUP VARIABLES
|
-- SETUP VARIABLES
|
||||||
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]);
|
||||||
DECLARE @Name NVARCHAR(50) = CONCAT(
|
DECLARE @Name NVARCHAR(50) = CONCAT(
|
||||||
'L', @Number, '-D-DEPARTMENTS'
|
'L', @Number, '-D-D6-SELL-CODES'
|
||||||
);
|
);
|
||||||
DECLARE @LayerId UNIQUEIDENTIFIER = NEWID();
|
DECLARE @LayerId UNIQUEIDENTIFIER = NEWID();
|
||||||
|
|
||||||
@@ -27,10 +27,16 @@ DECLARE @Array TABLE (
|
|||||||
|
|
||||||
INSERT INTO @Array (Code, Desc1)
|
INSERT INTO @Array (Code, Desc1)
|
||||||
VALUES
|
VALUES
|
||||||
('0', 'OTHER'),
|
('1002', '1102'),
|
||||||
('1','K5'),
|
('1003','1202'),
|
||||||
('2','AK'),
|
('1008','1302'),
|
||||||
('3','PU')
|
('1009','1302'),
|
||||||
|
('9085','1203'),
|
||||||
|
('1010','1304'),
|
||||||
|
('9086','1005'),
|
||||||
|
('1021','1206'),
|
||||||
|
('9089','1207'),
|
||||||
|
('9091','1208')
|
||||||
|
|
||||||
-- Loop through the array and insert into the target table
|
-- Loop through the array and insert into the target table
|
||||||
DECLARE @Code NVARCHAR(50);
|
DECLARE @Code NVARCHAR(50);
|
||||||
|
|||||||
Reference in New Issue
Block a user