From f83310a5524e6b2f534a4acef5a0b2bdedd70a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 27 Feb 2017 10:30:28 +0300 Subject: [PATCH] Added serilog to the application. --- docker/docker-compose.yml | 5 ++++- .../Blogging/AbpDeskMongoBlogModule.cs | 10 ++++++++++ .../Areas/Blog/Views/Posts/Index.cshtml | 7 +++---- src/AbpDesk/AbpDesk.MongoBlog/project.json | 2 +- .../AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs | 4 +--- src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs | 12 +++++++++++- src/AbpDesk/AbpDesk.Web.Mvc/project.json | 4 +++- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 13824 -> 15872 bytes 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1326e3a7de..314feb5709 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,10 @@ services: image: tutum/mongodb environment: - AUTH=no - + ports: + - "27017:27017" + - "28017:28017" + abpidentity_httpapihost: image: abpidentity/httpapihost environment: diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs index d41acc9a87..b316a4cca2 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Reflection; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Domain.Repositories; @@ -46,11 +47,16 @@ namespace AbpDesk.Blogging { using (var scope = context.ServiceProvider.CreateScope()) { + var logger = context.ServiceProvider.GetRequiredService>(); + + logger.LogInformation("Running seed data for mongo blog module..."); + using (var uow = scope.ServiceProvider.GetRequiredService().Begin()) { var blogPostRepository = scope.ServiceProvider.GetRequiredService>(); if (blogPostRepository.Any()) { + logger.LogInformation($"No need to seed database since there are already {blogPostRepository.Count()} blog posts!"); return; } @@ -79,7 +85,11 @@ namespace AbpDesk.Blogging } ); + logger.LogInformation("Inserted two blog post. completing the unit of work..."); + uow.Complete(); + + logger.LogInformation("Completed!"); } } } diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml index 39c6c5c4ed..fd4730b7e9 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml +++ b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml @@ -2,7 +2,7 @@

Blog Posts

-
    +
      @foreach (var post in Model) {

      @post.Title

      @@ -13,11 +13,10 @@ } else { -

      Comments

      +
      Comments
      foreach (var comment in post.Comments) { -
      @comment.Name
      -

      @comment.Message

      +

      @comment.Name: @comment.Message

      } } } diff --git a/src/AbpDesk/AbpDesk.MongoBlog/project.json b/src/AbpDesk/AbpDesk.MongoBlog/project.json index 750885ddd4..f034394965 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/project.json +++ b/src/AbpDesk/AbpDesk.MongoBlog/project.json @@ -21,6 +21,6 @@ }, "scripts": { - "postcompile": [ "xcopy %compile:OutputDir%\\AbpDesk.MongoBlog.dll ..\\Web_PlugIns" ] + "postcompile": [ "xcopy /y %compile:OutputDir%\\AbpDesk.MongoBlog.dll ..\\Web_PlugIns\\" ] } } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index 3e040c8914..d2dadb8c46 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.EmbeddedFiles; using Volo.Abp.AspNetCore.Modularity; @@ -41,6 +40,7 @@ namespace AbpDesk.Web.Mvc services.Configure(configuration.GetSection("AbpIdentity:HttpApiClient")); services.AddMvc(); + services.AddAssemblyOf(); } @@ -48,8 +48,6 @@ namespace AbpDesk.Web.Mvc { var app = context.GetApplicationBuilder(); - context.GetLoggerFactory().AddConsole().AddDebug(); - if (context.GetEnvironment().IsDevelopment()) { app.UseDeveloperExceptionPage(); diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs index cb00f5d22c..8269e6ad6b 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Serilog; using Volo.Abp.Modularity.PlugIns; namespace AbpDesk.Web.Mvc @@ -20,7 +21,7 @@ namespace AbpDesk.Web.Mvc { services.AddApplication(options => { - /* @halil: I added Abp.MongoDb as a dependency to the main application. + /* @halil: I added Abp.MongoDb package as a dependency to the main application in order to use the blog plugin. * Otherwise, we should add all dependencies (Recursively) into plugin folder * and load in correct order. We should carefully think on that problem in the future. */ @@ -34,6 +35,15 @@ namespace AbpDesk.Web.Mvc public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { + loggerFactory + .AddConsole() + .AddDebug() + .AddSerilog(new LoggerConfiguration() + .Enrich.FromLogContext() + .WriteTo.RollingFile("logs.txt") + .CreateLogger() + ); + app.InitializeApplication(); } } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/project.json b/src/AbpDesk/AbpDesk.Web.Mvc/project.json index b115de1ed3..2e7fc556f9 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/project.json +++ b/src/AbpDesk/AbpDesk.Web.Mvc/project.json @@ -28,7 +28,9 @@ "Volo.Abp.AspNetCore.EmbeddedFiles": "1.0.0-*", "Volo.Abp.Identity.Web": "1.0.0-*", "Volo.Abp.MongoDB": "1.0.0-*", - "Volo.Abp.Identity.HttpApi.Client": "1.0.0-*" + "Volo.Abp.Identity.HttpApi.Client": "1.0.0-*", + "Serilog.Extensions.Logging": "1.4.0", + "Serilog.Sinks.RollingFile": "3.3.0" }, "tools": { diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index e8df7e287755323a25f7686b17c8810f5f61c813..11cba1ef034b0363f09a99c761f91bcedff389b2 100644 GIT binary patch delta 6515 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 delta 4396 zcmZWt3vg7`8UFuscke5Am)#A!c@j2H_7P$*fXXw-Ln5(>hF2`LM9M^vvLQq(<+014 z7Ex@&6$M)#;D`@U%0w7t)XHe-Fx6HnwY9AXwIcYawZdqo4DEN$E(YjL?sxw8f6jki zcQ&&sv*c&%D_;J5_gu<7$EYHj$Mr;Y5a?Oq(&pZ0XZuT=iCUy!KG9sQw>;m;5INxg zaV=4)dw5i>+s?!6o?3{ac%A059uy!*(e7IjRKze#wn$m<6DbTw9~zBa22rfu{nFc# z9wBp4;#m>PQiwHJrSqmDs`aFbRqOYp3MGNw%QO!m4N4NEl8qBp5xSrJHe2j+1l?X; z(7i{BQu%Ppi3+=at3=`RqV)FaqVA8CtmwRKdv$TQ!P2t;B0EH}2E-d~bPs_r85t0d zgg7t6u~BHV31Xu`I!Q9+EL{Pb5+(H-?Z=d(&_S^hrS#Z(t%->&s1r%yPA~#|rQ2fE z6^CS|aMN-qdSi4440oQg(5wPVlo=k-`Rm{|Gfw9mW8(#g~%&hyN%2GI$*Mro$^ zh@sOmiD?RW@6dI6NQu5s_^!e;9%*#1XOm^qcYuDX_N?a+y=QiDg!a)HD?)vy&!^Li zS|==D@$9jR>CZ@0Mjf=v_R~CPJ(p3MWcmhZb(-pQ8fA2swg)y_Ag`eGZW;rluT7~w zYjheB`at*jifNp8j#Wdf6(D6ulPTlgCB6tXYD;_xI$`XD1W-!kR8FS27IUk$4GhWe> zi))>FFHRs$>E3oa^=ClqirWQlFIJ4Dxb@%;VSVM3#sT^oaTnsUC?l;rK%cyh*f!E>ZLdh112&kbKImLZ@QSV&D$* zhrsRjZIDl(6~K3CHBe)TEp!*~@6;>44mVm$RrD+2p(_=4kRG%T3NN)NPR7(xjk${JEgWnehHh2X z(mE>QY4*~cihaX6DFQIvm{X4Q#W5+HbGq@q01EtQPB+B)qcCVkPM2^#0JmFlcdCRY zy{tHy{u5!64~GW^NdHELJgQRML3&b;bK0TyENfk>#o3__#l2y*X#vdC;+(D@ratP< z=`pM_SWMf1 zIvr4Wm}HF(ldKK1lotVOs0kRL6~N)NLRn(|&uY^!(>t6N;J@^FD5l?9O56BVr-w=v z{S5zAdw}-vbbTk4t8gRuFV=oKM0>S2=m6{HAv(k}e23{JX#a%$@HC&K>y>3My(#*s z9W?VIB{|M$eF|aG>bpvxX`T6 z_!On3`VI9QM%=&jCdrAW0ur^l?RhsAy(s&n&f?qN57Sb13DFik<{a7kVZs z)A>r&kwa;eQS{>qUsE_=$j}*uk1Kpl;W34zNo`bNqeAlh9FmdrPpamzd^3(Z#vz7J zN;)Hou^%S+iqmN7oHF1NO^OUd;x(rHz<(4*0-Hr%Gd575;4*{*6gYqk(0-u66v*pl zFi_wFCJ%H3D5wBdOoc#!eKrVmG0?!xPzh|LYD!PUjdU*^qcE3oGyjyIK`zNa>ah4;&Tc@~9u{vY;l-mnB0u#m8HxLU&SBAYz7J~5B^dv7 z^h|~y;ReGc&KwHzYC3}VOLk|57rF<-SGY!Gf;%HJzi)qJF1yu*wQgtOf813?U43VY zt`_dh(oOE!(v9v5LtY4XF6{Y!TTe$fE&rD2>2RMf+u$}19p&CRw4?9z&{^y*F5lWW zyJ9Q{Cv|pqFYN5-S$IP#)kE-fcUQJpGRpLxp03GmeN}_IsH)2Ct-7pl|FAd*Oy|J3 z#AkN%gCBi0!Ai^<Lz$04Od+99kO`p~3JQ6h+ioc$XmsRPNa1gvu}oI0bLhZ4taJRH{cgw020T>_=#YVyfL= zB(DoRXX@zE0S*-!Dxce*9PL$AaYxoxF0$n?vpvSrXEkbNZ6i?5QH~bf@cT^|t1eqo zsVFDvVZYy>Wsnv_-=@WI)W>98nbrga)4t!;`b6K~>gMUS=YP7uEls6z_07OLoalzO zDQzD-xnY5IDt_HhX1|m7hnf8w`+hLW~9-g