Merge pull request #21 from gigya/develop

ver 1.0.0
gigya · Jun 4, 2017 · b465cf5 · b465cf5
2 parents c210b39 + 157102d
commit b465cf5
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 19 deletions.
diff --git a/Gigya.Microdot.Logging.NLog/NLogLogger.cs b/Gigya.Microdot.Logging.NLog/NLogLogger.cs
@@ -40,7 +40,7 @@ protected override Task<bool> WriteLog(TraceEventType level, LogCallSiteInfo log
             var logLevel = ToLogLevel(level);
             if (Logger.IsEnabled(logLevel))
             {
-                var messageWithTags = message + string.Join(", ", unencryptedTags.Select(kvp => $"{kvp.Key.Substring(5)}={EventFieldFormatter.SerializeFieldValue(kvp.Value)}")) + ". ";
+                var messageWithTags = message + ". " + string.Join(", ", unencryptedTags.Select(kvp => $"{kvp.Key.Substring(5)}={EventFieldFormatter.SerializeFieldValue(kvp.Value)}")) + ". ";
                 Logger.Log(logLevel, exception, messageWithTags, null);
             }
 

diff --git a/Gigya.Microdot.Ninject.Host/MicrodotServiceHost.cs b/Gigya.Microdot.Ninject.Host/MicrodotServiceHost.cs
@@ -25,12 +25,11 @@
 using Gigya.Microdot.Hosting.Service;
 using Gigya.Microdot.Interfaces.Events;
 using Gigya.Microdot.Interfaces.Logging;
-using Gigya.Microdot.Ninject;
 using Gigya.Microdot.SharedLogic;
 using Ninject;
 using Ninject.Syntax;
 
-namespace Gigya.Ninject.Host
+namespace Gigya.Microdot.Ninject.Host
 {
     /// <summary>
     /// Base class for all non-Orleans services that use Ninject. Override <see cref="Configure"/> to configure your own
@@ -68,7 +67,7 @@ protected override void OnStart()
         {
             Kernel = CreateKernel();
 
-            PreConfigure();
+            PreConfigure(Kernel);
 
             Kernel.Rebind<IActivator>().To<InstanceBasedActivator<TInterface>>().InSingletonScope();
             Kernel.Rebind<IServiceInterfaceMapper>().To<IdentityServiceInterfaceMapper>().InSingletonScope().WithConstructorArgument(typeof(TInterface));
@@ -118,12 +117,13 @@ protected override void Dispose(bool disposing)
         /// you should always call base.PreConfigure(), and if all inheritors of the class are concrete services, you should also
         /// mark this method as sealed to prevent confusion with Configure().
         /// </summary>
-        protected virtual void PreConfigure()
+        /// <param name="kernel">Kernel that should contain bindings for the service.</param>
+        protected virtual void PreConfigure(IKernel kernel)
         {
-            Kernel.Load<MicrodotModule>();
-            Kernel.Load<MicrodotHostingModule>();
-            GetLoggingModule().Bind(Kernel.Rebind<ILog>(), Kernel.Rebind<IEventPublisher>());
-            Kernel.Rebind<ServiceArguments>().ToConstant(Arguments);
+            kernel.Load<MicrodotModule>();
+            kernel.Load<MicrodotHostingModule>();
+            GetLoggingModule().Bind(kernel.Rebind<ILog>(), kernel.Rebind<IEventPublisher>());
+            kernel.Rebind<ServiceArguments>().ToConstant(Arguments);
         }
 
 

diff --git a/Gigya.Microdot.Orleans.Ninject.Host/MicrodotOrleansServiceHost.cs b/Gigya.Microdot.Orleans.Ninject.Host/MicrodotOrleansServiceHost.cs
@@ -45,7 +45,7 @@ public abstract class MicrodotOrleansServiceHost : GigyaServiceHost
 
         protected GigyaSiloHost SiloHost { get; set; }
 
-        protected IKernel Kernel { get; set; }
+        private IKernel Kernel { get; set; }
 
         public abstract ILoggingModule GetLoggingModule();
 
@@ -58,7 +58,7 @@ protected override void OnStart()
         {
             Kernel = CreateKernel();
 
-            PreConfigure();          
+            PreConfigure(Kernel);          
 
             Configure(Kernel, Kernel.Get<OrleansCodeConfig>());
 
@@ -98,15 +98,16 @@ protected virtual IKernel CreateKernel()
         /// you should always call base.PreConfigure(), and if all inheritors of the class are concrete services, you should also
         /// mark this method as sealed to prevent confusion with Configure().
         /// </summary>
-        protected virtual void PreConfigure()
+        /// <param name="kernel"></param>
+        protected virtual void PreConfigure(IKernel kernel)
         {
-            Kernel.Load<MicrodotModule>();
-            Kernel.Load<MicrodotHostingModule>();
-            Kernel.Load<MicrodotOrleansHostModule>();
+            kernel.Load<MicrodotModule>();
+            kernel.Load<MicrodotHostingModule>();
+            kernel.Load<MicrodotOrleansHostModule>();
 
-            Kernel.Rebind<ServiceArguments>().ToConstant(Arguments);
+            kernel.Rebind<ServiceArguments>().ToConstant(Arguments);
 
-            GetLoggingModule().Bind(Kernel.Rebind<ILog>(), Kernel.Rebind<IEventPublisher>());
+            GetLoggingModule().Bind(kernel.Rebind<ILog>(), kernel.Rebind<IEventPublisher>());
         }
 
 

diff --git a/Gigya.Microdot.ServiceProxy/Caching/CachingProxyProvider.cs b/Gigya.Microdot.ServiceProxy/Caching/CachingProxyProvider.cs
@@ -31,7 +31,7 @@
 
 namespace Gigya.Microdot.ServiceProxy.Caching
 {
-    public class CachingProxyProvider<TInterface>
+    public class CachingProxyProvider<TInterface> : ICachingProxyProvider<TInterface>
     {
         /// <summary>
         /// The instance of the transparent proxy used to access the data source with caching.

diff --git a/Gigya.Microdot.ServiceProxy/Caching/ICachingProxyProvider.cs b/Gigya.Microdot.ServiceProxy/Caching/ICachingProxyProvider.cs
@@ -0,0 +1,18 @@
+namespace Gigya.Microdot.ServiceProxy.Caching
+{
+    public interface ICachingProxyProvider<TInterface>
+    {
+        /// <summary>
+        /// The instance of the actual data source, used when the data is not present in the cache.
+        /// </summary>
+        TInterface DataSource { get; }
+
+        /// <summary>
+        /// The instance of the transparent proxy used to access the data source with caching.
+        /// </summary>
+        /// <remarks>
+        /// This is a thread-safe instance.
+        /// </remarks>
+        TInterface Proxy { get; }
+    }
+}
diff --git a/Gigya.Microdot.ServiceProxy/Gigya.Microdot.ServiceProxy.csproj b/Gigya.Microdot.ServiceProxy/Gigya.Microdot.ServiceProxy.csproj
@@ -49,6 +49,7 @@
     <Compile Include="Caching\AsyncMemoizer.cs" />
     <Compile Include="Caching\CachingProxyProvider.cs" />
     <Compile Include="Caching\ICache.cs" />
+    <Compile Include="Caching\ICachingProxyProvider.cs" />
     <Compile Include="Caching\IMemoizer.cs" />
     <Compile Include="Caching\IMetadataProvider.cs" />
     <Compile Include="Caching\MetadataProvider.cs" />

diff --git a/Gigya.Microdot.UnitTests/TestingHost.cs b/Gigya.Microdot.UnitTests/TestingHost.cs
@@ -8,8 +8,8 @@
 using Gigya.Microdot.Interfaces.Events;
 using Gigya.Microdot.Interfaces.Logging;
 using Gigya.Microdot.Ninject;
+using Gigya.Microdot.Ninject.Host;
 using Gigya.Microdot.SharedLogic;
-using Gigya.Ninject.Host;
 using Ninject;
 using Ninject.Syntax;
 using NSubstitute;