vs_utils/Utils
1
0
Fork 0
Code Issues Pull Requests Releases 25 Wiki Activity

[1.6.1] ProgrammLogger Fixed

Browse Source
This commit is contained in:
BlubbFish 2022-01-20 19:42:14 +01:00
parent 61f26e69af
commit e3d37988c9
3 changed files with 192 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog.md
View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## 1.6.1 - 2022-01-20 - ProgrammLogger Fixed
### New Features
### Bugfixes
* Unhandled exception. System.IO.IOException: The file '/var/log/zwaybot/debug.log' already exists.
### Changes
## 1.6.0 - 2022-01-09 - HttpEndpoint added ## 1.6.0 - 2022-01-09 - HttpEndpoint added
### New Features ### New Features
* Add HttpEndpoint * Add HttpEndpoint

303
Utils/ProgramLogger.cs
View File

@ -1,150 +1,167 @@
using System; using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace BlubbFish.Utils { namespace BlubbFish.Utils {
public class ProgramLogger { public class ProgramLogger {
private FileWriter fw; private FileWriter fw;
private ConsoleWriter stdout; private ConsoleWriter stdout;
private ConsoleWriter errout; private ConsoleWriter errout;
private String loggerfile; private String loggerfile;
public ProgramLogger() { public ProgramLogger() {
this.loggerfile = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "output.log"; this.loggerfile = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "output.log";
this.Init(this.loggerfile); this.Init(this.loggerfile);
this.AttachToFw(); this.AttachToFw();
this.SetOutputs(); this.SetOutputs();
} }
private void SetOutputs() { private void SetOutputs() {
Console.SetOut(this.stdout); Console.SetOut(this.stdout);
Console.SetError(this.errout); Console.SetError(this.errout);
} }
private void Init(String file) { private void Init(String file) {
if(!this.IsWritable(file)) { if(!this.IsWritable(file)) {
Console.Error.WriteLine("Cannot write to " + file); Console.Error.WriteLine("Cannot write to " + file);
throw new ArgumentException("Cannot write to " + file); throw new ArgumentException("Cannot write to " + file);
} }
this.fw = new FileWriter(file); this.fw = new FileWriter(file, false);
this.stdout = new ConsoleWriter(Console.Out, ConsoleWriterEventArgs.ConsoleType.Info); this.stdout = new ConsoleWriter(Console.Out, ConsoleWriterEventArgs.ConsoleType.Info);
this.errout = new ConsoleWriter(Console.Error, ConsoleWriterEventArgs.ConsoleType.Error); this.errout = new ConsoleWriter(Console.Error, ConsoleWriterEventArgs.ConsoleType.Error);
} }
private Boolean IsWritable(String filename) { private Boolean IsWritable(String filename) {
try { try {
using FileStream fstream = new FileStream(filename, FileMode.Append); using FileStream fstream = new FileStream(filename, FileMode.Append);
using TextWriter writer = new StreamWriter(fstream); using TextWriter writer = new StreamWriter(fstream);
writer.Write(""); writer.Write("");
} catch (UnauthorizedAccessException) { } catch (UnauthorizedAccessException) {
return false; return false;
} }
return true; return true;
} }
public void SetPath(String file) { public void SetPath(String file) {
if(file == null) { if(file == null) {
return; return;
} }
if (!this.IsWritable(file)) { if (!this.IsWritable(file)) {
Console.Error.WriteLine("Cannot write to " + file); Console.Error.WriteLine("Cannot write to " + file);
throw new ArgumentException("Cannot write to " + file); throw new ArgumentException("Cannot write to " + file);
} }
this.DisattachToFw(); this.DisattachToFw();
this.fw.Close(); this.fw.Close();
if(new FileInfo(this.loggerfile).Length > 0) { if(new FileInfo(this.loggerfile).Length > 0) {
File.Move(this.loggerfile, file); if(File.Exists(file)) {
} else { this.FileCopy(this.loggerfile, file);
File.Delete(this.loggerfile); File.Delete(this.loggerfile);
} } else {
this.loggerfile = file; File.Move(this.loggerfile, file);
this.fw = new FileWriter(this.loggerfile); }
this.AttachToFw(); } else {
} File.Delete(this.loggerfile);
}
private void DisattachToFw() { this.loggerfile = file;
this.stdout.WriteEvent -= this.fw.Write; this.fw = new FileWriter(this.loggerfile, true);
this.stdout.WriteLineEvent -= this.fw.WriteLine; this.AttachToFw();
this.errout.WriteEvent -= this.fw.Write; }
this.errout.WriteLineEvent -= this.fw.WriteLine;
} private void FileCopy(String source, String target) {
private void AttachToFw() { using FileStream fread = new FileStream(source, FileMode.Open);
this.stdout.WriteEvent += this.fw.Write; using FileStream fwrite = new FileStream(target, FileMode.Create);
this.stdout.WriteLineEvent += this.fw.WriteLine; using TextReader reader = new StreamReader(fread);
this.errout.WriteEvent += this.fw.Write; using TextWriter writer = new StreamWriter(fwrite);
this.errout.WriteLineEvent += this.fw.WriteLine;
} writer.Write(reader.ReadToEnd());
} writer.Flush();
writer.Close();
internal class FileWriter : StreamWriter { reader.Close();
private Boolean newline = true; }
public FileWriter(String path) : base(path) {
} private void DisattachToFw() {
this.stdout.WriteEvent -= this.fw.Write;
this.stdout.WriteLineEvent -= this.fw.WriteLine;
this.errout.WriteEvent -= this.fw.Write;
this.errout.WriteLineEvent -= this.fw.WriteLine;
}
private void AttachToFw() {
this.stdout.WriteEvent += this.fw.Write;
this.stdout.WriteLineEvent += this.fw.WriteLine;
this.errout.WriteEvent += this.fw.Write;
this.errout.WriteLineEvent += this.fw.WriteLine;
}
}
internal class FileWriter : StreamWriter {
private Boolean newline = true;
public FileWriter(String path, Boolean append) : base(path, append) {
}
public override Encoding Encoding => Encoding.UTF8; public override Encoding Encoding => Encoding.UTF8;
public override Boolean AutoFlush { get => true; set => base.AutoFlush = value; } public override Boolean AutoFlush { get => true; set => base.AutoFlush = value; }
private void Write(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) { private void Write(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
String text; String text;
if (this.newline) { if (this.newline) {
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value; text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
this.newline = false; this.newline = false;
} else { } else {
text = value; text = value;
} }
origstream.Write(text); origstream.Write(text);
base.Write(text); base.Write(text);
base.Flush(); base.Flush();
} }
private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) { private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
String text = this.newline ? "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value : value; String text = this.newline ? "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value : value;
this.newline = true; this.newline = true;
origstream.WriteLine(text); origstream.WriteLine(text);
base.WriteLine(text); base.WriteLine(text);
base.Flush(); base.Flush();
} }
internal void Write(Object sender, ConsoleWriterEventArgs e) => this.Write(e.Value, e.Writer, e.StreamType); internal void Write(Object sender, ConsoleWriterEventArgs e) => this.Write(e.Value, e.Writer, e.StreamType);
internal void WriteLine(Object sender, ConsoleWriterEventArgs e) => this.WriteLine(e.Value, e.Writer, e.StreamType); internal void WriteLine(Object sender, ConsoleWriterEventArgs e) => this.WriteLine(e.Value, e.Writer, e.StreamType);
} }
internal class ConsoleWriterEventArgs : EventArgs { internal class ConsoleWriterEventArgs : EventArgs {
public String Value { get; private set; } public String Value { get; private set; }
public TextWriter Writer { get; private set; } public TextWriter Writer { get; private set; }
public ConsoleType StreamType { get; private set; } public ConsoleType StreamType { get; private set; }
public enum ConsoleType { public enum ConsoleType {
Info, Info,
Error Error
} }
public ConsoleWriterEventArgs(String value, TextWriter writer, ConsoleType type) { public ConsoleWriterEventArgs(String value, TextWriter writer, ConsoleType type) {
this.Value = value; this.Value = value;
this.Writer = writer; this.Writer = writer;
this.StreamType = type; this.StreamType = type;
} }
} }
internal class ConsoleWriter : TextWriter { internal class ConsoleWriter : TextWriter {
private readonly TextWriter stream; private readonly TextWriter stream;
private readonly ConsoleWriterEventArgs.ConsoleType streamtype; private readonly ConsoleWriterEventArgs.ConsoleType streamtype;
public ConsoleWriter(TextWriter writer, ConsoleWriterEventArgs.ConsoleType type) { public ConsoleWriter(TextWriter writer, ConsoleWriterEventArgs.ConsoleType type) {
this.stream = writer; this.stream = writer;
this.streamtype = type; this.streamtype = type;
} }
public override Encoding Encoding => Encoding.UTF8; public override Encoding Encoding => Encoding.UTF8;
public override void Write(String value) => this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); public override void Write(String value) => this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype));
//base.Write(value); //base.Write(value);
public override void WriteLine(String value) => this.WriteLineEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); public override void WriteLine(String value) => this.WriteLineEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype));
//base.WriteLine(value); //base.WriteLine(value);
public event EventHandler<ConsoleWriterEventArgs> WriteEvent; public event EventHandler<ConsoleWriterEventArgs> WriteEvent;
public event EventHandler<ConsoleWriterEventArgs> WriteLineEvent; public event EventHandler<ConsoleWriterEventArgs> WriteLineEvent;
} }
} }

51
Utils/Utils.csproj
View File

@ -8,37 +8,38 @@
<Company>BlubbFish</Company> <Company>BlubbFish</Company>
<Authors>BlubbFish</Authors> <Authors>BlubbFish</Authors>
<PackageId>Utils.BlubbFish</PackageId> <PackageId>Utils.BlubbFish</PackageId>
<Copyright>Copyright © BlubbFish 2014 - 09.01.2022</Copyright> <Copyright>Copyright © BlubbFish 2014 - 20.01.2022</Copyright>
<Version>1.6.0</Version> <Version>1.6.1</Version>
<NeutralLanguage>de-DE</NeutralLanguage> <NeutralLanguage>de-DE</NeutralLanguage>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>http://git.blubbfish.net/vs_utils/Utils</PackageProjectUrl> <PackageProjectUrl>http://git.blubbfish.net/vs_utils/Utils</PackageProjectUrl>
<RepositoryUrl>http://git.blubbfish.net/vs_utils/Utils.git</RepositoryUrl> <RepositoryUrl>http://git.blubbfish.net/vs_utils/Utils.git</RepositoryUrl>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<PackageReleaseNotes> <PackageReleaseNotes>
1.6.0 HttpEndpoint added 1.6.1 - 2022-01-20 - ProgrammLogger Fixed
1.5.0 Add GetEvent so you can call events by string; Add OwnSingeton class 1.6.0 - 2022-01-09 - HttpEndpoint added
1.4.0 Add Helper to Utils 1.5.0 - 2021-04-10 - Add GetEvent so you can call events by string; Add OwnSingeton class
1.1.3 Improve CmdArgs 1.4.0 - 2018-11-27 - Add Helper to Utils
1.1.2 Tiny Codingstyles 1.1.3 - 2018-10-02 - Improve CmdArgs
1.1.1 ProgrammLogger neets to cleanup 1.1.2 - 2018-09-11 - Tiny Codingstyles
1.1.0 ProgrammLogger 1.1.1 - 2018-05-29 - ProgrammLogger neets to cleanup
1.0.7.0 Yet another IniReader improvemnt round again 1.1.0 - 2018-05-15 - ProgrammLogger
1.0.6.0 Yet another IniReader improvemnt round 1.0.7.0 - 2018-05-08 - Yet another IniReader improvemnt round again
1.0.5.2 And Improve IniReader again 1.0.6.0 - 2017-12-22 - Yet another IniReader improvemnt round
1.0.5.1 Improve IniReader again 1.0.5.2 - 2017-09-26 - And Improve IniReader again
1.0.5.0 Improve IniReader 1.0.5.1 - 2017-09-24 - Improve IniReader again
1.0.4.1 Cleanup OwnView 1.0.5.0 - 2017-08-09 - Improve IniReader
1.0.4.0 More Updater 1.0.4.1 - 2017-08-08 - Cleanup OwnView
1.0.3.2 Next Updater 1.0.4.0 - 2017-04-30 - More Updater
1.0.3.1 EventArgsHelper 1.0.3.2 - 2017-04-26 - Next Updater
1.0.2.6 Better Updater 1.0.3.1 - 2017-04-25 - EventArgsHelper
1.0.2.5 Logging in OwnObject 1.0.2.6 - 2017-04-24 - Better Updater
1.0.2.3 OwnModel better 1.0.2.5 - 2017-04-19 - Logging in OwnObject
1.0.2.2 Make it nice 1.0.2.3 - 2017-04-16 - OwnModel better
1.0.2.1 Filemutex 1.0.2.2 - 2017-03-09 - Make it nice
1.0.0.1 Filelogger improvements 1.0.2.1 - 2017-03-09 - Filemutex
1.0.0.0 Init 1.0.0.1 - 2016-12-03 - Filelogger improvements
1.0.0.0 - 2015-11-16 - Init
</PackageReleaseNotes> </PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>