From e8eaffa8cf14a0367e1ef47511a20091432246c9 Mon Sep 17 00:00:00 2001 From: malmas18 <29763502+malmas18@users.noreply.github.com> Date: Thu, 8 Aug 2019 08:12:03 +1000 Subject: [PATCH] Update manifest (#11) * update manifest * update location of logger --- .circleci/config.yml | 4 ++-- .manifests/logger.alpha.yml | 2 +- .manifests/logger.dev.yml | 3 ++- .manifests/logger.pc.yml | 3 ++- .manifests/logger.prod.yml | 2 +- .manifests/logger.rc.yml | 3 ++- .vscode/launch.json | 4 ++-- .../logs/{logger.tests => worker.tests}/LoggerTests.cs | 0 .../logs/{logger.tests => worker.tests}/logger.tests.csproj | 4 ++-- subscribers/logs/{logger => worker}/AppConfig.cs | 0 subscribers/logs/{logger => worker}/AppService.cs | 0 subscribers/logs/{logger => worker}/Converter.cs | 0 subscribers/logs/{logger => worker}/ILoggerAdapter.cs | 0 subscribers/logs/{logger => worker}/IMessageProcessor.cs | 0 subscribers/logs/{logger => worker}/LogEntry.cs | 0 subscribers/logs/{logger => worker}/LoggerContext.cs | 0 subscribers/logs/{logger => worker}/MessageProcessor.cs | 0 .../Migrations/20190801015934_InitialCreate.Designer.cs | 0 .../Migrations/20190801015934_InitialCreate.cs | 0 .../Migrations/LoggerContextModelSnapshot.cs | 0 subscribers/logs/{logger => worker}/Program.cs | 0 subscribers/logs/{logger => worker}/README.md | 0 subscribers/logs/{logger => worker}/VcapServices.cs | 0 subscribers/logs/{logger => worker}/loggerAdapter.cs | 0 subscribers/logs/{logger => worker}/worker.csproj | 0 25 files changed, 14 insertions(+), 11 deletions(-) rename subscribers/logs/{logger.tests => worker.tests}/LoggerTests.cs (100%) rename subscribers/logs/{logger.tests => worker.tests}/logger.tests.csproj (84%) rename subscribers/logs/{logger => worker}/AppConfig.cs (100%) rename subscribers/logs/{logger => worker}/AppService.cs (100%) rename subscribers/logs/{logger => worker}/Converter.cs (100%) rename subscribers/logs/{logger => worker}/ILoggerAdapter.cs (100%) rename subscribers/logs/{logger => worker}/IMessageProcessor.cs (100%) rename subscribers/logs/{logger => worker}/LogEntry.cs (100%) rename subscribers/logs/{logger => worker}/LoggerContext.cs (100%) rename subscribers/logs/{logger => worker}/MessageProcessor.cs (100%) rename subscribers/logs/{logger => worker}/Migrations/20190801015934_InitialCreate.Designer.cs (100%) rename subscribers/logs/{logger => worker}/Migrations/20190801015934_InitialCreate.cs (100%) rename subscribers/logs/{logger => worker}/Migrations/LoggerContextModelSnapshot.cs (100%) rename subscribers/logs/{logger => worker}/Program.cs (100%) rename subscribers/logs/{logger => worker}/README.md (100%) rename subscribers/logs/{logger => worker}/VcapServices.cs (100%) rename subscribers/logs/{logger => worker}/loggerAdapter.cs (100%) rename subscribers/logs/{logger => worker}/worker.csproj (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 000597bc..7bc6bc53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: - dot_net_build: path: "subscribers/slack/worker" - dot_net_build: - path: "subscribers/logs/logger" + path: "subscribers/logs/worker" - persist_to_workspace: root: . paths: @@ -120,7 +120,7 @@ jobs: - dot_net_test: path: "subscribers/slack/worker.tests" - dot_net_test: - path: "subscribers/logs/logger.tests" + path: "subscribers/logs/worker.tests" - persist_to_workspace: root: . paths: diff --git a/.manifests/logger.alpha.yml b/.manifests/logger.alpha.yml index df2e767b..7f1581ac 100644 --- a/.manifests/logger.alpha.yml +++ b/.manifests/logger.alpha.yml @@ -1,7 +1,7 @@ applications: - name: dm-alpha-logger buildpack: dotnet_core_buildpack - path: ../subscribers/logs/logger + path: ../subscribers/logs/worker health-check-type: process instances: 1 memory: 50M diff --git a/.manifests/logger.dev.yml b/.manifests/logger.dev.yml index a7da9e55..e4a8112d 100644 --- a/.manifests/logger.dev.yml +++ b/.manifests/logger.dev.yml @@ -1,10 +1,11 @@ applications: - name: dm-dev-logger buildpack: dotnet_core_buildpack - path: ../subscribers/logs/logger + path: ../subscribers/logs/worker health-check-type: process instances: 1 memory: 50M disk_quota: 100M services: - ups-dm-dev-logger + - db-service-dm-dev-logger diff --git a/.manifests/logger.pc.yml b/.manifests/logger.pc.yml index 1ff1df18..ec7197b0 100644 --- a/.manifests/logger.pc.yml +++ b/.manifests/logger.pc.yml @@ -1,10 +1,11 @@ applications: - name: dm-pc-logger buildpack: dotnet_core_buildpack - path: ../subscribers/logs/logger + path: ../subscribers/logs/worker health-check-type: process instances: 1 memory: 50M disk_quota: 100M services: - ups-dm-pc-logger + - db-service-dm-pc-logger diff --git a/.manifests/logger.prod.yml b/.manifests/logger.prod.yml index 4fa762dc..5fb6ebc6 100644 --- a/.manifests/logger.prod.yml +++ b/.manifests/logger.prod.yml @@ -1,7 +1,7 @@ applications: - name: dm-logger buildpack: dotnet_core_buildpack - path: ../subscribers/logs/logger + path: ../subscribers/logs/worker health-check-type: process instances: 1 memory: 128M diff --git a/.manifests/logger.rc.yml b/.manifests/logger.rc.yml index b7a52404..1f03497e 100644 --- a/.manifests/logger.rc.yml +++ b/.manifests/logger.rc.yml @@ -1,10 +1,11 @@ applications: - name: dm-rc-logger buildpack: dotnet_core_buildpack - path: ../subscribers/logs/logger + path: ../subscribers/logs/worker health-check-type: process instances: 1 memory: 50M disk_quota: 100M services: - ups-dm-rc-logger + - db-service-dm-rc-logger diff --git a/.vscode/launch.json b/.vscode/launch.json index c8879bd1..b2e1ea94 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -27,9 +27,9 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/subscribers/logs/logger/bin/Debug/netcoreapp2.2/logger.worker.dll", + "program": "${workspaceFolder}/subscribers/logs/worker/bin/Debug/netcoreapp2.2/logger.worker.dll", "args": [], - "cwd": "${workspaceFolder}/subscribers/logs/logger", + "cwd": "${workspaceFolder}/subscribers/logs/worker", "console": "internalConsole", "stopAtEntry": false, "internalConsoleOptions": "openOnSessionStart", diff --git a/subscribers/logs/logger.tests/LoggerTests.cs b/subscribers/logs/worker.tests/LoggerTests.cs similarity index 100% rename from subscribers/logs/logger.tests/LoggerTests.cs rename to subscribers/logs/worker.tests/LoggerTests.cs diff --git a/subscribers/logs/logger.tests/logger.tests.csproj b/subscribers/logs/worker.tests/logger.tests.csproj similarity index 84% rename from subscribers/logs/logger.tests/logger.tests.csproj rename to subscribers/logs/worker.tests/logger.tests.csproj index e449801e..c94aa375 100644 --- a/subscribers/logs/logger.tests/logger.tests.csproj +++ b/subscribers/logs/worker.tests/logger.tests.csproj @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ netcoreapp2.2 - Logger.Worker.logger.Tests + Logger.Worker.Tests diff --git a/subscribers/logs/logger/AppConfig.cs b/subscribers/logs/worker/AppConfig.cs similarity index 100% rename from subscribers/logs/logger/AppConfig.cs rename to subscribers/logs/worker/AppConfig.cs diff --git a/subscribers/logs/logger/AppService.cs b/subscribers/logs/worker/AppService.cs similarity index 100% rename from subscribers/logs/logger/AppService.cs rename to subscribers/logs/worker/AppService.cs diff --git a/subscribers/logs/logger/Converter.cs b/subscribers/logs/worker/Converter.cs similarity index 100% rename from subscribers/logs/logger/Converter.cs rename to subscribers/logs/worker/Converter.cs diff --git a/subscribers/logs/logger/ILoggerAdapter.cs b/subscribers/logs/worker/ILoggerAdapter.cs similarity index 100% rename from subscribers/logs/logger/ILoggerAdapter.cs rename to subscribers/logs/worker/ILoggerAdapter.cs diff --git a/subscribers/logs/logger/IMessageProcessor.cs b/subscribers/logs/worker/IMessageProcessor.cs similarity index 100% rename from subscribers/logs/logger/IMessageProcessor.cs rename to subscribers/logs/worker/IMessageProcessor.cs diff --git a/subscribers/logs/logger/LogEntry.cs b/subscribers/logs/worker/LogEntry.cs similarity index 100% rename from subscribers/logs/logger/LogEntry.cs rename to subscribers/logs/worker/LogEntry.cs diff --git a/subscribers/logs/logger/LoggerContext.cs b/subscribers/logs/worker/LoggerContext.cs similarity index 100% rename from subscribers/logs/logger/LoggerContext.cs rename to subscribers/logs/worker/LoggerContext.cs diff --git a/subscribers/logs/logger/MessageProcessor.cs b/subscribers/logs/worker/MessageProcessor.cs similarity index 100% rename from subscribers/logs/logger/MessageProcessor.cs rename to subscribers/logs/worker/MessageProcessor.cs diff --git a/subscribers/logs/logger/Migrations/20190801015934_InitialCreate.Designer.cs b/subscribers/logs/worker/Migrations/20190801015934_InitialCreate.Designer.cs similarity index 100% rename from subscribers/logs/logger/Migrations/20190801015934_InitialCreate.Designer.cs rename to subscribers/logs/worker/Migrations/20190801015934_InitialCreate.Designer.cs diff --git a/subscribers/logs/logger/Migrations/20190801015934_InitialCreate.cs b/subscribers/logs/worker/Migrations/20190801015934_InitialCreate.cs similarity index 100% rename from subscribers/logs/logger/Migrations/20190801015934_InitialCreate.cs rename to subscribers/logs/worker/Migrations/20190801015934_InitialCreate.cs diff --git a/subscribers/logs/logger/Migrations/LoggerContextModelSnapshot.cs b/subscribers/logs/worker/Migrations/LoggerContextModelSnapshot.cs similarity index 100% rename from subscribers/logs/logger/Migrations/LoggerContextModelSnapshot.cs rename to subscribers/logs/worker/Migrations/LoggerContextModelSnapshot.cs diff --git a/subscribers/logs/logger/Program.cs b/subscribers/logs/worker/Program.cs similarity index 100% rename from subscribers/logs/logger/Program.cs rename to subscribers/logs/worker/Program.cs diff --git a/subscribers/logs/logger/README.md b/subscribers/logs/worker/README.md similarity index 100% rename from subscribers/logs/logger/README.md rename to subscribers/logs/worker/README.md diff --git a/subscribers/logs/logger/VcapServices.cs b/subscribers/logs/worker/VcapServices.cs similarity index 100% rename from subscribers/logs/logger/VcapServices.cs rename to subscribers/logs/worker/VcapServices.cs diff --git a/subscribers/logs/logger/loggerAdapter.cs b/subscribers/logs/worker/loggerAdapter.cs similarity index 100% rename from subscribers/logs/logger/loggerAdapter.cs rename to subscribers/logs/worker/loggerAdapter.cs diff --git a/subscribers/logs/logger/worker.csproj b/subscribers/logs/worker/worker.csproj similarity index 100% rename from subscribers/logs/logger/worker.csproj rename to subscribers/logs/worker/worker.csproj