Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of Net 3181 consul gh issue 15709 allow log file naming like nomad - fix bug into release/1.15.x #18641

Merged
merged 5 commits into from
Sep 4, 2023
Merged

Backport of Net 3181 consul gh issue 15709 allow log file naming like nomad - fix bug into release/1.15.x #18641

merged 5 commits into from
Sep 4, 2023

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #18631 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "4b9586e3d6113ce1efb67d7194edc51e7dc14dd2", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.

Description

Fixes issue where if consul.log is already present and server starts the file gets truncated.

Testing & Reproduction steps

Manual testing.

Links

Reference taken from - hashicorp/nomad#11386

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern
Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/daily-helpful-bluebird branch from eac33ef to 95fa69c Compare September 1, 2023 09:24
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/daily-helpful-bluebird branch from 37abe96 to fcfc056 Compare September 1, 2023 09:24
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 1, 2023 09:24 Inactive
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Sep 1, 2023
View reviewed changes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions bot added the theme/telemetry Anything related to telemetry or observability label Sep 1, 2023
@vercel vercel bot temporarily deployed to Preview – consul September 1, 2023 09:30 Inactive
@absolutelightning
Net 3181 consul gh issue 15709 allow log file naming like nomad - fix…
138645b 
… bug (#18631)

* fixes file name for consul

* added log file

* added tests for rename method

* append instead of trunc

* fix file truncate issue

* added changelog

* fix for build destros ci

* removed changelog

* solaris
@absolutelightning absolutelightning marked this pull request as ready for review September 4, 2023 11:13
@absolutelightning absolutelightning merged commit 6bdd979 into release/1.15.x Sep 4, 2023
82 checks passed
@absolutelightning absolutelightning deleted the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/daily-helpful-bluebird branch September 4, 2023 11:24
@jira jira bot mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@absolutelightning absolutelightning absolutelightning approved these changes

Assignees

@absolutelightning absolutelightning

Labels
theme/telemetry Anything related to telemetry or observability
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @absolutelightning