VRH / Vrh.Web.Reporting

Commit 10ecabc5c3bb7074c100aadfc3582b70ea5cb517

Authored by Schwirg László
1 parent 8ca2173e

Vrh.Web.Reporting v1.1.2.0

Showing 2 changed files with 9 additions and 7 deletions   Show diff stats
Inline Side-by-side
Vrh.Web.Reporting/Properties/AssemblyInfo.cs
  Show/Hide comments   View file @10ecabc
... ... @@ -36,6 +36,6 @@ using System.Runtime.InteropServices;
36 36 // You can specify all the values or you can default the Build and Revision Numbers
37 37 // by using the '*' as shown below:
38 38 // [assembly: AssemblyVersion("1.0.*")]
39   -[assembly: AssemblyVersion("1.1.1.0")]
40   -[assembly: AssemblyFileVersion("1.1.1.0")]
41   -[assembly: AssemblyInformationalVersion("1.1.1")]
  39 +[assembly: AssemblyVersion("1.1.2.0")]
  40 +[assembly: AssemblyFileVersion("1.1.2.0")]
  41 +[assembly: AssemblyInformationalVersion("1.1.2")]
... ...
Vrh.Web.Reporting/WebServerHostedServiceStarter.cs
  Show/Hide comments   View file @10ecabc
... ... @@ -286,7 +286,9 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS
286 286 websitename = websitename ?? HostingEnvironment.SiteName; //websitename = System.Web.Hosting.HostingEnvironment.ApplicationHost.GetSiteName();
287 287 webapplicationname = webapplicationname ?? HostingEnvironment.ApplicationVirtualPath; //webapplicationname = System.Web.HttpRuntime.AppDomainAppVirtualPath;
288 288 applicationpoolname = applicationpoolname ?? GetCurrentApplicationPoolName(websitename);
289   - string autostartprovidername = (websitename + "____" + applicationpoolname + "____" + webapplicationname).Replace(" ", "_").Replace("-", "_").Replace("/", "_");
  289 + const string PARTSEP = "____";
  290 + string autostartprovidername = string.Concat(websitename,PARTSEP,applicationpoolname,PARTSEP,webapplicationname, PARTSEP, typeof(WebServerHostedServiceStarter).FullName)
  291 + .Replace(" ", "_").Replace("-", "_").Replace("/", "_").Replace(".", "_");
290 292 string serviceAutoStartProviderTypeFullName = serviceAutoStartProviderType.FullName;
291 293 string serviceAutoStartProviderAssassemblyName = serviceAutoStartProviderType.Assembly.GetName().Name;
292 294 string configfilepath = Path.Combine(NativeSystemPath, CONFIGFILEDIRECTORY, CONFIGFILENAME);
... ... @@ -325,7 +327,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS
325 327 }
326 328  
327 329 reader = new StreamReader(file, Encoding.ASCII);
328   - filecontent = ProcessFileContent(le, reader.ReadToEnd(), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value);
  330 + filecontent = ProcessFileContent(reader.ReadToEnd(), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value);
329 331 configchanged = filecontent != null;
330 332 if (configchanged)
331 333 {
... ... @@ -337,7 +339,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS
337 339 }
338 340 else
339 341 {
340   - filecontent = ProcessFileContent(le, System.IO.File.ReadAllText(configfilepath), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value);
  342 + filecontent = ProcessFileContent(System.IO.File.ReadAllText(configfilepath), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value);
341 343 configchanged = filecontent != null;
342 344 if (configchanged) System.IO.File.WriteAllText(configfilepath, filecontent);
343 345 }
... ... @@ -348,7 +350,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS
348 350 catch (Exception ex) { le.AddDataField("SetupAutoStart EXCEPTION",ex.Message); le.SetLogLevel(LogLevel.Error); return; }
349 351 finally { if (writele) le.Write(); }
350 352 }
351   - private static string ProcessFileContent(DCLogEntry le, string filecontent,string applicationpoolname,string websitename,string webapplicationname,string autostartprovidername,string serviceAutoStartProviderAssassemblyName, string serviceAutoStartProviderTypeFullName,bool disablemode)
  353 + private static string ProcessFileContent(string filecontent,string applicationpoolname,string websitename,string webapplicationname,string autostartprovidername,string serviceAutoStartProviderAssassemblyName, string serviceAutoStartProviderTypeFullName,bool disablemode)
352 354 {
353 355 const string SYSTEMAPPLICATIONHOST_ELEMENT = "system.applicationHost";
354 356 const string APPLICATIONPOOLS_ELEMENT = "applicationPools";
... ...