AM2R-Community-Developers
/
AM2RLauncher
mirror of https://github.com/AM2R-Community-Developers/AM2RLauncher
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux: Only log env vars when on debug + set default log level to info

Browse Source
pull/32/head
Miepee 4 years ago
parent a9a5135d76
commit d768552f7a
10 changed files with 56 additions and 103 deletions
Show Stats Download Patch File Download Diff File

7
AM2RLauncher/AM2RLauncher.Gtk/Program.cs
Unescape View File

@ -5,7 +5,7 @@ using System;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using GLib;
using log4net.Repository.Hierarchy;
using Application = Eto.Forms.Application;
using FileInfo = System.IO.FileInfo;
@ -39,6 +39,11 @@ internal static class MainClass
// Configure logger
XmlConfigurator.Configure(new FileInfo(launcherDataPath + "/log4net.config"));
// if we're on debug, always set loglevel to debug
#if DEBUG
((Logger)log.Logger).Level = log4net.Core.Level.Debug;
#endif
// Log distro and version (if it exists)
if (File.Exists("/etc/os-release"))
{

61
AM2RLauncher/AM2RLauncher.Gtk/Properties/Resources.Designer.cs generated
Unescape View File

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
// This code was generated by a tool.
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@ -12,46 +11,32 @@ namespace AM2RLauncher.Gtk.Properties {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
private static System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AM2RLauncher.Gtk.Properties.Resources", typeof(Resources).Assembly);
if (object.Equals(null, resourceMan)) {
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("AM2RLauncher.Gtk.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@ -60,22 +45,6 @@ namespace AM2RLauncher.Gtk.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die &lt;log4net&gt;
/// &lt;root&gt;
/// &lt;level value=&quot;ALL&quot; /&gt;
/// &lt;appender-ref ref=&quot;file&quot; /&gt;
/// &lt;/root&gt;
/// &lt;appender name=&quot;file&quot; type=&quot;log4net.Appender.RollingFileAppender&quot;&gt;
/// &lt;file value=&quot;${DATADIR}/Logs/AM2RLauncher.log&quot; /&gt;
/// &lt;appendToFile value=&quot;true&quot; /&gt;
/// &lt;rollingStyle value=&quot;Once&quot; /&gt;
/// &lt;maxSizeRollBackups value=&quot;7&quot; /&gt;
/// &lt;maximumFileSize value=&quot;3MB&quot; /&gt;
/// &lt;staticLogFileName value=&quot;true&quot; /&gt;
/// &lt;layout type=&quot;log4net.Layout.PatternLayout&quot;&gt;
/// &lt;conversionPattern value=&quot;%date [%thread] %level %logg [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
/// </summary>
internal static string log4netContents {
get {
return ResourceManager.GetString("log4netContents", resourceCulture);

2
AM2RLauncher/AM2RLauncher.Gtk/Properties/Resources.resx
Unescape View File

@ -120,7 +120,7 @@
<data name="log4netContents" xml:space="preserve">
<value>&lt;log4net&gt;
&lt;root&gt;
&lt;level value="ALL" /&gt;
&lt;level value="INFO" /&gt;
&lt;appender-ref ref="file" /&gt;
&lt;/root&gt;
&lt;appender name="file" type="log4net.Appender.RollingFileAppender"&gt;

6
AM2RLauncher/AM2RLauncher.Mac/Program.cs
Unescape View File

@ -4,6 +4,7 @@ using log4net.Config;
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using log4net.Repository.Hierarchy;
namespace AM2RLauncher.Mac;
@ -36,6 +37,11 @@ internal static class MainClass
// Configure logger
XmlConfigurator.Configure(new FileInfo(launcherDataPath + "/log4net.config"));
// if we're on debug, always set loglevel to debug
#if DEBUG
((Logger)log.Logger).Level = log4net.Core.Level.Debug;
#endif
try
{
Application macLauncher = new Application(Eto.Platforms.Mac64);

2
AM2RLauncher/AM2RLauncher.Mac/Properties/Resources.Designer.cs generated
Unescape View File

@ -1,7 +1,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -10,7 +9,6 @@
namespace AM2RLauncher.Mac.Properties {
using System;
using System.Reflection;
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

2
AM2RLauncher/AM2RLauncher.Mac/Properties/Resources.resx
Unescape View File

@ -120,7 +120,7 @@
<data name="log4netContents" xml:space="preserve">
<value>&lt;log4net&gt;
&lt;root&gt;
&lt;level value="ALL" /&gt;
&lt;level value="INFO" /&gt;
&lt;appender-ref ref="file" /&gt;
&lt;/root&gt;
&lt;appender name="file" type="log4net.Appender.RollingFileAppender"&gt;

6
AM2RLauncher/AM2RLauncher.Wpf/Program.cs
Unescape View File

@ -4,6 +4,7 @@ using log4net.Config;
using System;
using System.IO;
using System.Reflection;
using log4net.Repository.Hierarchy;
namespace AM2RLauncher.Wpf;
@ -35,6 +36,11 @@ internal static class MainClass
// Configure logger
XmlConfigurator.Configure(new FileInfo(launcherDataPath + "/log4net.config"));
// if we're on debug, always set loglevel to debug
#if DEBUG
((Logger)log.Logger).Level = log4net.Core.Level.Debug;
#endif
//Log Wine
if (Core.Core.IsThisRunningFromWine)
log.Info("Currently running from WINE!");

61
AM2RLauncher/AM2RLauncher.Wpf/Properties/Resources.Designer.cs generated
Unescape View File

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
// This code was generated by a tool.
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@ -12,46 +11,32 @@ namespace AM2RLauncher.Wpf.Properties {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
private static System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AM2RLauncher.Wpf.Properties.Resources", typeof(Resources).Assembly);
if (object.Equals(null, resourceMan)) {
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("AM2RLauncher.Wpf.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@ -60,22 +45,6 @@ namespace AM2RLauncher.Wpf.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die &lt;log4net&gt;
/// &lt;root&gt;
/// &lt;level value=&quot;ALL&quot; /&gt;
/// &lt;appender-ref ref=&quot;file&quot; /&gt;
/// &lt;/root&gt;
/// &lt;appender name=&quot;file&quot; type=&quot;log4net.Appender.RollingFileAppender&quot;&gt;
/// &lt;file value=&quot;${DATADIR}/Logs/AM2RLauncher.log&quot; /&gt;
/// &lt;appendToFile value=&quot;true&quot; /&gt;
/// &lt;rollingStyle value=&quot;Once&quot; /&gt;
/// &lt;maxSizeRollBackups value=&quot;7&quot; /&gt;
/// &lt;maximumFileSize value=&quot;3MB&quot; /&gt;
/// &lt;staticLogFileName value=&quot;true&quot; /&gt;
/// &lt;layout type=&quot;log4net.Layout.PatternLayout&quot;&gt;
/// &lt;conversionPattern value=&quot;%date [%thread] %level %logg [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
/// </summary>
internal static string log4netContents {
get {
return ResourceManager.GetString("log4netContents", resourceCulture);

2
AM2RLauncher/AM2RLauncher.Wpf/Properties/Resources.resx
Unescape View File

@ -120,7 +120,7 @@
<data name="log4netContents" xml:space="preserve">
<value>&lt;log4net&gt;
&lt;root&gt;
&lt;level value="ALL" /&gt;
&lt;level value="INFO" /&gt;
&lt;appender-ref ref="file" /&gt;
&lt;/root&gt;
&lt;appender name="file" type="log4net.Appender.RollingFileAppender"&gt;

10
AM2RLauncher/AM2RLauncherCore/Profile.cs
Unescape View File

@ -492,7 +492,7 @@ public static class Profile
{
ProcessStartInfo startInfo = new ProcessStartInfo();
log.Info("Is the environment textbox null or whitespace = " + String.IsNullOrWhiteSpace(envVars));
log.Info("User does " + (String.IsNullOrWhiteSpace(envVars) ? "not" : "") + " have custom environment variables set.");
//TODO: make this more readable at one day
if (!String.IsNullOrWhiteSpace(envVars))
@ -524,7 +524,7 @@ public static class Profile
string value = envVars.Substring(0, valueSubstringLength);
envVars = envVars.Substring(value.Length);
log.Info("Adding variable \"" + variable + "\" with value \"" + value + "\"");
log.Info("Adding user variable \"" + variable + "\" with value \"" + value + "\"");
startInfo.EnvironmentVariables[variable] = value;
}
}
@ -538,10 +538,10 @@ public static class Profile
log.Info("CWD of Profile is " + startInfo.WorkingDirectory);
log.Info("Launching game with following variables: ");
log.Debug("Launching game with following variables: ");
foreach (System.Collections.DictionaryEntry item in startInfo.EnvironmentVariables)
{
log.Info("Key: \"" + item.Key + "\" Value: \"" + item.Value + "\"");
log.Debug("Key: \"" + item.Key + "\" Value: \"" + item.Value + "\"");
}
using (Process p = new Process())
@ -702,4 +702,4 @@ public static class Profile
log.Info("AM2R_11 check successful!");
return IsZipAM2R11ReturnCodes.Successful;
}
}
}
Write Preview
Loading…
Cancel
Save