-
-
Notifications
You must be signed in to change notification settings - Fork 56
Conversation
Merge Titan upstream into your fork
… for better logging
Titan/Properties/AssemblyInfo.cs
Outdated
@@ -18,6 +18,6 @@ | |||
// Titan uses SemVer (Microsoft doesn't prefer that and displays a warning), thats why we disable the compiler warnings. | |||
[assembly: AssemblyVersion("1.6.0")] | |||
[assembly: AssemblyFileVersion("1.6.0")] | |||
[assembly: AssemblyInformationalVersion("1.6.0-<%GitHash%>")] // Will be edited by Cake Build Script | |||
[assembly: AssemblyInformationalVersion("1.6.0-e7b1319")] // Will be edited by Cake Build Script |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert this back to <%GitHash%>
.
TitanTest/Properties/AssemblyInfo.cs
Outdated
@@ -19,6 +19,6 @@ | |||
// TitanTest uses SemVer (Microsoft doesn't prefer that and displays a warning), thats why we disable the compiler warnings. | |||
[assembly: AssemblyVersion("1.6.0")] | |||
[assembly: AssemblyFileVersion("1.6.0")] | |||
[assembly: AssemblyInformationalVersion("1.6.0-<%GitHash%>")] // Will be edited by Cake Build Script | |||
[assembly: AssemblyInformationalVersion("1.6.0-e7b1319")] // Will be edited by Cake Build Script |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert this back to <%GitHash%>
.
Titan/Managers/ThreadManager.cs
Outdated
@@ -229,7 +246,8 @@ public void StartCommend(TitanAccount account, CommendInfo info) | |||
var timeSpent = DateTime.Now.Subtract(account.StartEpoch.ToDateTime()); | |||
|
|||
_log.Error("Connection to account {Account} timed out. It was not possible to " + | |||
"commend the target after {Timespan} seconds.", account.JsonAccount.Username, timeSpent.Seconds); | |||
"commend the target after {Timespan} seconds.", account.JsonAccount.Username, | |||
timeSpent.Seconds); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix formatting here.
@@ -302,7 +320,8 @@ public void StartMatchResolving(TitanAccount account, LiveGameInfo info) | |||
var timeSpent = DateTime.Now.Subtract(account.StartEpoch.ToDateTime()); | |||
|
|||
_log.Error("Connection to account {Account} timed out. It was not possible to resolve the Match " + | |||
"ID for the target after {Timespan} seconds.", account.JsonAccount.Username, timeSpent.Seconds); | |||
"ID for the target after {Timespan} seconds.", account.JsonAccount.Username, | |||
timeSpent.Seconds); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix formatting here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the value will be edited by the Cake Build Script but is supposted to be reverted back after the build process finished. It seems you cancelled the build process mid-way.
Also, please follow the Contributor Covenant Code of Conduct before discussing and contributing to the Titan repository and the issues section. Inappropriate language may result in you losing your Collaborator permissions.
This reverts commit db6ad80.
* Fix printing issues + handle default case in report / commend session for better logging * Maybe this looks better as an error? * Fix formatting? :niggerthink: * GitHash? * GitHash? v2 * Hotfix for #86 * Hotfix for #86 * Revert "Hotfix for #86" This reverts commit db6ad80. * This formatting is getting annoying
Description
Describe your pull request here
Type
Checklist
Check the checkbox(es) that apply.
./build.sh
is passing with every build step and every test locally.Discussion
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...
Reviewers
@Marc3842h, ...