FIXES

.gitignore

@@ -20,3 +20,4 @@ Wlog.Clients/bin/
 Wlog.Clients/obj/
 WLog.Loggers/obj/
 WLog.Loggers/bin/
+Wlog.TestApp/obj/

Wlog.Library/BLL/Classes/LogMessage.cs

@@ -18,7 +18,7 @@ public class LogMessage
         public DateTime SourceDate { get; set; }
         public string Message { get; set; }
         public string Level { get; set; }
-        public string ApplicationKey { get; private set; }
+        public string ApplicationKey { get;  set; }
         public string Stacktrace { get; set; }
         /// <summary>
         /// JSON string field to store custom attributes

Wlog.Library/BLL/Classes/LogsSearchSettings.cs

@@ -14,7 +14,7 @@ namespace Wlog.Library.BLL.Classes
 {
     public class LogsSearchSettings:SearchSettingsBase
     {
-        public string SearchMessage { get; set; }
+       public string SearchMessage { get; set; }
         public List<Guid> Applications { get; set; }
         public string OrderBy { get; set; }
         public SortDirection SortDirection { get; set; }

Wlog.Library/BLL/DataBase/NHibernateContext.cs

@@ -33,24 +33,14 @@ public static Configuration GetConfiguration()
 
             Configuration cfg = new Configuration();
 
-            //if (System.Configuration.ConfigurationManager.AppSettings["_override_connectionstring"] != null)
-            //{
-            //    cfg.SetProperty("_override_connectionstring", System.Configuration.ConfigurationManager.AppSettings["_override_connectionstring"]);
-            //}
 
 
-            //if (System.Configuration.ConfigurationManager.AppSettings["_override_connectionstring"] != null)
-            //{
-            //    cfg.SetProperty("_override_connectionstring", System.Configuration.ConfigurationManager.AppSettings["_override_connectionstring"]);
-            //}
+            ModelMapper mapper = new ModelMapper();
+            mapper.AddMappings(Assembly.GetExecutingAssembly().GetExportedTypes());
 
-
-            //ModelMapper mapper = new ModelMapper();
-            //mapper.AddMappings(Assembly.GetExecutingAssembly().GetExportedTypes());
-
-            //HbmMapping domainMapping =
-            //  mapper.CompileMappingForAllExplicitlyAddedEntities();
-            //cfg.AddMapping(domainMapping);
+            HbmMapping domainMapping =
+              mapper.CompileMappingForAllExplicitlyAddedEntities();
+            cfg.AddMapping(domainMapping);
             cfg.Configure();
 
             return cfg;

Wlog.Library/BLL/Helpers/InfoHelper.cs

@@ -39,6 +39,7 @@ public static string GetAssemblyAttribute<T>(Func<T, string> value, Assembly a)
 
         public static AssemblyMetadata GetAssemblyMetadata(Assembly assembly)
         {
+            if (assembly == null) return null;
             logger.Debug("[ih] entering GetAssemblyMetadata");
             AssemblyMetadata aa = new AssemblyMetadata();
             aa.Title = GetAssemblyAttribute<AssemblyTitleAttribute>(a => (a != null) ? a.Title : String.Empty, assembly);

Wlog.Library/BLL/Index/LuceneIndexManager.cs

@@ -73,6 +73,7 @@ public int UncommittedFiles
         public bool Autocommit { get; set; }
 
 
+        private object reopen="";
 
         public bool IsDirty
         {
@@ -98,11 +99,14 @@ public LuceneIndexManager(string name, string path, LuceneConfigurationSettings
 
         private void Init()
         {
-            //TODO: [LOW] use factory or DI to  setup analyzer, query parse, and other tuning attribute. 
-            logger.Debug("[IndexManager] init");
-            analyzer = new StandardAnalyzer(global::Lucene.Net.Util.Version.LUCENE_30);
-            InitIndex();
-            parser = new QueryParser(global::Lucene.Net.Util.Version.LUCENE_30, "", analyzer);
+            lock (reopen)
+            {
+                //TODO: [LOW] use factory or DI to  setup analyzer, query parse, and other tuning attribute. 
+                logger.Debug("[IndexManager] init");
+                analyzer = new StandardAnalyzer(global::Lucene.Net.Util.Version.LUCENE_30);
+                InitIndex();
+                parser = new QueryParser(global::Lucene.Net.Util.Version.LUCENE_30, "", analyzer);
+            }
         }
 
         private void InitIndex()
@@ -113,9 +117,22 @@ private void InitIndex()
             logger.Debug("[IndexManager] Opening {0}", Path);
             luceneIndexDirectory = settings.GetLuceneIndexDirectory(Path);
             logger.Debug("[IndexManager] Creating IndexWriter");
-            writer = new IndexWriter(luceneIndexDirectory, analyzer, IndexWriter.MaxFieldLength.UNLIMITED);
+            if (writer == null)
+            {
+                writer = new IndexWriter(luceneIndexDirectory, analyzer, IndexWriter.MaxFieldLength.UNLIMITED);
+            }
+            else
+            {
+                writer.Commit();
+            }
             logger.Debug("[IndexManager] Creating IndexReader");
-            reader = IndexReader.Open(luceneIndexDirectory, true);
+            if (reader != null)
+            {
+                reader.Close();
+            }
+
+                reader = IndexReader.Open(luceneIndexDirectory, true);
+
             logger.Debug("[IndexManager] Creating IndexSearcher");
             searcher = new IndexSearcher(reader);
         }
@@ -278,11 +295,15 @@ public IPagedList<Document> Query(Query query, Sort field, int start, int size)
 
         private void ReopenIndex()
         {
+            lock (reopen)
+            {
 
-            logger.Debug("[IndexManager] Reopen index");
+                logger.Debug("[IndexManager] Reopen index");
 
-            DisposeIndex();
-            InitIndex();
+               // DisposeIndex();
+
+                InitIndex();
+            }
         }
 
         public void Dispose()
@@ -306,6 +327,7 @@ public void DisposeIndex()
                 {
                     writer.Commit();
                     writer.Dispose();
+
                 }
                 catch (Exception err)
                 {

Wlog.Web/Areas/HelpPage/Views/Help/Index.cshtml

@@ -5,35 +5,29 @@
 @model Collection<ApiDescription>
 
 @{
-    ViewBag.Title = "ASP.NET Web API Help Page";
+    ViewBag.Title = "HubLink Api docs";
 
     // Group APIs by controller
     ILookup<string, ApiDescription> apiGroups = Model.ToLookup(api => api.ActionDescriptor.ControllerDescriptor.ControllerName);
 }
 
-<header>
-    <div class="content-wrapper">
-        <div class="float-left">
-            <h1>@ViewBag.Title</h1>
-        </div>
+
+
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header"><i class="fa fa-link fa-fw" aria-hidden="true"></i> &nbsp; API</h1>
     </div>
-</header>
-<div id="body">
-    <section class="featured">
-        <div class="content-wrapper">
-            <h2>Introduction</h2>
-            <p>
-                Provide a general description of your APIs here.
-            </p>
-        </div>
-    </section>
+    <!-- /.col-lg-12 -->
+</div>
+
+
     <section class="content-wrapper main-content clear-fix">
         @foreach (var group in apiGroups)
         {
             @Html.DisplayFor(m => group, "ApiGroup")
         }
     </section>
-</div>
+
 
 @section Scripts {
     <link type="text/css" href="~/Areas/HelpPage/HelpPage.css" rel="stylesheet" />

Wlog.Web/Code/API/LogController.cs

@@ -8,11 +8,13 @@
 //******************************************************************************
 using NLog;
 using System;
+using System.Collections.Generic;
 using System.Web.Http;
 using Wlog.BLL.Classes;
 using Wlog.Library.BLL.Reporitories;
 using Wlog.Library.Scheduler;
 using Wlog.Web.Resources;
+using System.Linq;
 
 namespace Wlog.Web.Code.API
 {
@@ -51,8 +53,22 @@ private void SaveSingle(LogMessage value)
         {
             if (value == null) throw new Exception(Labels.LogMessageNull);
 
+            IEnumerable<string> headerValues;
+            var appKey = "";
+            var globalKey = false;
+            if (Request.Headers.TryGetValues("X-ApplicationKey",out headerValues))
+            {
+                appKey= headerValues.FirstOrDefault();
+                globalKey=appKey != null;
+            }
+
+
             if (LogQueue.Current.MaxQueueSize > LogQueue.Current.Count)
             {
+                if (globalKey)
+                {
+                    value.SetApplication( appKey);
+                }
                 LogQueue.Current.Enqueue(value);
             }
             else

Wlog.Web/Content/sb-admin-2.css

@@ -15,7 +15,7 @@ body {
 #page-wrapper {
     padding: 0 15px;
     min-height: 568px;
-    /*background-color: #fff;*/
+    background-color: #fff;
 }
 
 @media(min-width:768px) {

Wlog.Web/Controllers/InstallController.cs

@@ -118,6 +118,10 @@ public JsonResult Validate(string connectionString, string driver, string dialec
             {
 
                 var  basePath = this.HttpContext.Server.MapPath("~/App_Data/Index/");
+                if (!Directory.Exists(basePath))
+                {
+                    Directory.CreateDirectory(basePath);
+                }
                 var rdm = DateTime.Now.ToString("yyyyMMddHHmmss");
                 var testFile = System.IO.Path.Combine(basePath, rdm + "testfile.txt");
                 System.IO.File.WriteAllText(testFile, "xxx");

Wlog.Web/Controllers/PrivateController.cs

@@ -270,6 +270,42 @@ public ActionResult DeleteUser(UserData user)
             return View(user);
         }
 
+        #region Logs
+        public JsonResult Search(Guid? applicationId, string sortOrder, string sortBy, string serchMessage, int page, int pageSize)
+        {
+
+            _logger.Debug("[Private]: Search");
+            //TDOD: CHECK USER
+            var result = new JsonResult();
+
+            LogsSearchSettings lss = new LogsSearchSettings();
+            if (applicationId.HasValue)
+            {
+                lss.Applications = new List<Guid>();
+                lss.Applications.Add(applicationId.Value);
+            }
+            lss.OrderBy = sortBy;
+            lss.PageNumber = page;
+            lss.PageSize = pageSize;
+            lss.FullTextQuery = serchMessage??"";
+            lss.SortDirection = ("ASC".Equals(sortOrder, StringComparison.InvariantCultureIgnoreCase)) ? SortDirection.ASC : SortDirection.DESC;
+
+            IPagedList list = RepositoryContext.Current.Logs.SearchLogindex(applicationId.Value, lss);
+
+            result.JsonRequestBehavior = JsonRequestBehavior.AllowGet;
+
+            result.Data = new
+            {
+                draw = Request["draw"],
+                recordsTotal = list.TotalItemCount,
+                recordsFiltered = list.TotalItemCount,
+                data = list
+            };
+            return result;
+        }
+
+        #endregion
+
         #region Application
         // Get  /Private/ListApps
         [AuthorizeRoles(Constants.Roles.Admin, Constants.Roles.ReadLog)]

Wlog.Web/Global.asax.cs

@@ -46,22 +46,12 @@ protected void Application_Start()
 
                 Mapper.Initialize(cfg => cfg.AddProfile(new ApplicationProfile()));
 
-                _logger.Info("Apply schema changes");
-                SystemDataInitialisation.Instance.ApplySchemaChanges();
-
-                _logger.Info("Setup info config");
-
-                InfoPageConfigurator.Configure(c =>
-                {
-                    c.ApplicationName = "Wlog";
-
-                });
+
 
 
                 if (installed)
                 {
-                    //TODO: move this in installation process
-
+
 
                     _logger.Info("Apply schema changes");
                     RepositoryContext.Current.System.ApplySchemaChanges();

Wlog.Web/Views/Account/Login.cshtml

@@ -13,7 +13,8 @@
     <div class="panel-heading">
         <div class="panel-title text-center">
 
-            <h1 class="title">  WLOG</h1>
+            <h1 class="title">
+                <img src="~/Images/HubLinkLogo.png" height="50"/>  </h1>
 
         </div>
     </div>

Wlog.Web/Views/Install/Install.cshtml

@@ -48,11 +48,14 @@
     <div class="container">
 
         <div class="page-title">
-            <h1>wlog: install</h1>
+            <img src="~/Images/HubLinkLogo.png" height="30"  style="margin-top:30px"/>
+              <h1>Install</h1>
             <p class="lead">We are ready to install this application. Please fill some basic information and start setup. Configuration can be changed at anytime by editing manually web.config file.</p>
 
         </div>
 
+        <div class="alert alert-danger" role="alert"><b>PASSWORD:</b> will be set to 123456578 as temporary passoword. Please change it at first login.</div>
+
         <div class="row marketing">
             <div class="panel panel-default">
 

Wlog.Web/Views/Private/BackgroundJobs.cshtml

@@ -6,9 +6,14 @@
 }
 
 
-               <div class="page-header">
-                   <h1><i class="fa fa-cogs" aria-hidden="true"></i> &nbsp; Background Jobs Management </h1>
-               </div>
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header"><i class="fa fa-cogs" aria-hidden="true"></i> &nbsp; Background Jobs Management </h1>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+
 
                <div class="row">
 

Wlog.Web/Views/Private/DeleteApp.cshtml

@@ -4,9 +4,14 @@
     ViewBag.Title = "Delete App";
     Layout = "~/Views/Shared/_LayoutInternal.cshtml";
 }
-<div class="page-header">
-    <h1><i class="fa fa-cog" aria-hidden="true"></i> &nbsp; Delete Application: <i>@Model.ApplicationName</i></h1>
+
+
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header"><i class="fa fa-cog" aria-hidden="true"></i> &nbsp; Delete Application: <i>@Model.ApplicationName</i></h1>
     </div>
+    <!-- /.col-lg-12 -->
+</div>
 <div class="row">
     <h3>Are you sure you want to delete this?</h3>
 

Wlog.Web/Views/Private/DeleteUser.cshtml

@@ -4,9 +4,16 @@
     Layout = "~/Views/Shared/_LayoutInternal.cshtml";
 }
 
-<div class="page-header">
-    <h1><i class="fa fa-user" aria-hidden="true"></i> &nbsp; Delete User: <i>@Model.Username</i></h1>
+
+
+
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header"><i class="fa fa-user" aria-hidden="true"></i> &nbsp; Delete User: <i>@Model.Username</i></h1>
+    </div>
+    <!-- /.col-lg-12 -->
 </div>
+
 <div class="row">
 
     <h3>Are you sure you want to delete user <i> @Html.DisplayFor(model => model.Username, new { @class = "form-control" }) </i>?</h3>
@@ -78,3 +85,4 @@
         </p>
     }
 
+    </div>