Skip to content

Commit

Permalink
Merge pull request #131 from OMZigak/develop
Browse files Browse the repository at this point in the history
prod Deploy
  • Loading branch information
chaewonni authored Sep 4, 2024
2 parents 5a808fe + 2c65fc3 commit 59eea30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/dev-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ name: develop-CD
on:
push:
branches: [ "develop" ]
pull_request_target:
types: [ labeled, closed ]

jobs:
ci:
if: contains(github.event.pull_request.labels.*.name, 'dev')
runs-on: ubuntu-22.04
env:
working-directory: .
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ name: prod-CD
on:
push:
branches: [ "main" ]
pull_request_target:
types: [ labeled, closed ]

jobs:
ci:
if: contains(github.event.pull_request.labels.*.name, 'deploy')
runs-on: ubuntu-22.04
env:
working-directory: .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ private static Color getLevelColor(ILoggingEvent eventObject) {
} else if (level.equals("ERROR")) {
return Color.red;
}

return Color.blue;
}

Expand All @@ -46,14 +45,13 @@ protected void append(ILoggingEvent eventObject) {

String level = eventObject.getLevel().levelStr;
String exceptionBrief = "";
String exceptionDetail = "";
IThrowableProxy throwable = eventObject.getThrowableProxy();

if (throwable != null) {
exceptionBrief = throwable.getClassName() + ": " + throwable.getMessage();
exceptionBrief = throwable.getClassName() + ": " + throwable.getMessage().replaceAll("\"", "'");
}

if (exceptionBrief.equals("")) {
if (exceptionBrief.isEmpty()) {
exceptionBrief = "EXCEPTION 정보가 남지 않았습니다.";
}

Expand Down Expand Up @@ -99,7 +97,7 @@ protected void append(ILoggingEvent eventObject) {
);

if (throwable != null) {
exceptionDetail = ThrowableProxyUtil.asString(throwable);
String exceptionDetail = ThrowableProxyUtil.asString(throwable);
String exception = exceptionDetail.substring(0, 4000);
discordWebhook.addEmbed(
new EmbedObject()
Expand Down

0 comments on commit 59eea30

Please sign in to comment.