Browse Source

Directory: Add runner project

Mendel Monteiro-Beckerman 6 years ago
parent
commit
67bb6ccd29

+ 27 - 0
src/Abc.Zebus.Directory.Runner/Abc.Zebus.Directory.Runner.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <StartupObject>Abc.Zebus.Directory.Runner.Program</StartupObject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="system.Configuration.ConfigurationManager" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Abc.Zebus.Contracts\Abc.Zebus.Contracts.csproj" />
+    <ProjectReference Include="..\Abc.Zebus.Directory.Cassandra\Abc.Zebus.Directory.Cassandra.csproj" />
+    <ProjectReference Include="..\Abc.Zebus.Directory\Abc.Zebus.Directory.csproj" />
+    <ProjectReference Include="..\Abc.Zebus\Abc.Zebus.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

+ 0 - 3
src/Abc.Zebus.Directory/App.config → src/Abc.Zebus.Directory.Runner/App.config

@@ -5,7 +5,4 @@
     <add key="Environment" value="Demo"/>
     <add key="PeerId" value="Directory.0"/>
   </appSettings>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
-  </startup>
 </configuration>

+ 3 - 3
src/Abc.Zebus.Directory/Program.cs → src/Abc.Zebus.Directory.Runner/Program.cs

@@ -13,7 +13,7 @@ using log4net;
 using log4net.Config;
 using StructureMap;
 
-namespace Abc.Zebus.Directory
+namespace Abc.Zebus.Directory.Runner
 {
     internal class Program
     {
@@ -28,7 +28,7 @@ namespace Abc.Zebus.Directory
                 _cancelKeySignal.Set();
             };
 
-            XmlConfigurator.ConfigureAndWatch(new FileInfo(PathUtil.InBaseDirectory("log4net.config")));
+            XmlConfigurator.ConfigureAndWatch(LogManager.GetRepository(typeof(Program).Assembly), new FileInfo(PathUtil.InBaseDirectory("log4net.config")));
             _log.Info("Starting in memory directory");
 
             var busFactory = new BusFactory();
@@ -77,4 +77,4 @@ namespace Abc.Zebus.Directory
             });
         }
     }
-}
+}

+ 28 - 0
src/Abc.Zebus.Directory.Runner/log4net.config

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<log4net>
+  <root>
+    <level value="INFO" />
+    <appender type="log4net.Appender.ManagedColoredConsoleAppender">
+      <mapping>
+        <level value="ERROR" />
+        <foreColor value="DarkRed" />
+        <backColor value="White" />
+      </mapping>
+      <mapping>
+        <level value="WARN" />
+        <foreColor value="Yellow" />
+      </mapping>
+      <mapping>
+        <level value="INFO" />
+        <foreColor value="White" />
+      </mapping>
+      <mapping>
+        <level value="DEBUG" />
+        <foreColor value="Blue" />
+      </mapping>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date{HH:mm:ss.fff} - %-5level - %logger || %message%newline" />
+      </layout>
+    </appender>
+  </root>
+</log4net>

+ 0 - 6
src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj

@@ -14,10 +14,4 @@
     <Reference Include="Microsoft.VisualBasic" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

+ 0 - 11
src/Abc.Zebus.Directory/log4net.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<log4net>
-	<root>
-		<level value="INFO" />
-    <appender type="log4net.Appender.ColoredConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss.fff} - %-5level - %logger || %message%newline" />
-      </layout>
-    </appender>
-	</root>
-</log4net>

+ 7 - 1
src/Abc.Zebus.sln

@@ -46,7 +46,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Zebus.Persistence", "Ab
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Zebus.Persistence.RocksDb", "Abc.Zebus.Persistence.RocksDb\Abc.Zebus.Persistence.RocksDb.csproj", "{03C805D6-0217-4E94-8DF5-1C0ACD4CF82A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abc.Zebus.Persistence.RocksDb.Tests", "Abc.Zebus.Persistence.RocksDb.Tests\Abc.Zebus.Persistence.RocksDb.Tests.csproj", "{123C2076-DE3C-4F41-AC58-1AC5210F1CCD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Zebus.Persistence.RocksDb.Tests", "Abc.Zebus.Persistence.RocksDb.Tests\Abc.Zebus.Persistence.RocksDb.Tests.csproj", "{123C2076-DE3C-4F41-AC58-1AC5210F1CCD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abc.Zebus.Directory.Runner", "Abc.Zebus.Directory.Runner\Abc.Zebus.Directory.Runner.csproj", "{F9B2BCDB-401F-4A13-B235-375F06B0D206}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -122,6 +124,10 @@ Global
 		{123C2076-DE3C-4F41-AC58-1AC5210F1CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{123C2076-DE3C-4F41-AC58-1AC5210F1CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{123C2076-DE3C-4F41-AC58-1AC5210F1CCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9B2BCDB-401F-4A13-B235-375F06B0D206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B2BCDB-401F-4A13-B235-375F06B0D206}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9B2BCDB-401F-4A13-B235-375F06B0D206}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9B2BCDB-401F-4A13-B235-375F06B0D206}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 0
src/Abc.Zebus/Properties/AssemblyInfo.cs

@@ -6,6 +6,7 @@ using System.Runtime.InteropServices;
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 [assembly: InternalsVisibleTo("Abc.Zebus.Directory")]
+[assembly: InternalsVisibleTo("Abc.Zebus.Directory.Runner")]
 [assembly: InternalsVisibleTo("Abc.Zebus.Directory.Tests")]
 [assembly: InternalsVisibleTo("Abc.Zebus.Directory.Cassandra.Tests")]
 [assembly: InternalsVisibleTo("Abc.Zebus.Testing")]