-
Notifications
You must be signed in to change notification settings - Fork 26
Add Log Prefix for logs in an instance #275
Add Log Prefix for logs in an instance #275
Conversation
with custom looger Move all nessesaries nodecg.log to logger function
Closes #155 |
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.
Looks pretty good to me. Please resolve the merge conflicts as described in the guide you got on discord. I can resolve the conflicts aswell, if you need help.
As you asked over on our discord how to resolve merge conflicts, I thought I could help you. So here we go: Merge conflicts are a result of editing the same piece of code in two different branches, which you want to merge again. So the simplest solution is to merge the current https://github.com/codeoverflow-org/nodecg-io/master-branch into your feature-branch.
E.g., take a look at the diff of <<<<<<< HEAD (Current Change)
import { Result, emptySuccess, success, ServiceBundle, Logger } from "nodecg-io-core";
import { ApiClient } from "twitch";
=======
import { Result, emptySuccess, success, ServiceBundle } from "nodecg-io-core";
import { ApiClient } from "@twurple/api";
>>>>>>> upstream/master (Incoming Change) You added the logger to the imports, while Daniel bumped the version of the Twitch API. So to resolve this, you would either add the logger to the Incoming Change or the updated the dependency in the Current Change. Then push everything to your branch. |
You may take a look at TimTechDev@987b4f5. |
@daniel0611 Could you please resolve these merge conflicts, because I do not have write accesses to do this. Thanks! |
Sure, no problem! You actually succesfully merged the master branch but there we other changes and thus more conflicts. |
I want to mention that there are 4 test cases failing. |
Yeah. These failures are because the logger is now passed to |
Yes, Also, I looked at this commit history and want to mention that this will cause problems with git blame and other tools, because the contents of the master branch got duplicated. |
What do you mean with "duplicated"? Because of 755ae35? GitHub shows the new changes from the other branch in merge commits that resolved conflicts. This is not the case when using |
with custom logger
Move all necessary functions from nodecg.log to logger