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.

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

fix [ISSUE #12323] , using the project's logback packagingData configuration instead of logback-nacos.xml's packagingData configuration #12360

Merged
merged 1 commit into from
Jul 18, 2024

Conversation

dingjs
Copy link
Contributor

@dingjs dingjs commented Jul 16, 2024

What is the purpose of the change

fix issue #12323 , using project's logback packagingData configuration instead of logback-nacos.xml's packagingData configuration

Brief changelog

Before LogbackNacosLoggingAdapter loading logback-nocas.xml ,get the isPackagingDataEnabled property , when logback-nocas.xml is loaded , revert the isPackagingDataEnabled property of LoggerContext .

Verifying this change

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

… configuration instead of logback-nacos.xml's packagingData configuration
@KomachiSion KomachiSion merged commit 8664a1a into alibaba:develop Jul 18, 2024
7 checks passed
@KomachiSion KomachiSion added area/Client Related to Nacos Client SDK kind/bug Category issues or prs related to bug. labels Jul 18, 2024
@KomachiSion KomachiSion added this to the 2.4.0 milestone Jul 18, 2024
lowezheng added a commit to lowezheng/nacos that referenced this pull request Jul 24, 2024
…apexsoft

* commit '197795a854992d3f88824e4cdde34c61d8f56cf4': (225 commits)
  Fix alibaba#12395, use request context replace session depend. (alibaba#12398)
  Revert "Add an id primary key column to both the roles and permissions tables.(mysql-schema.sql) (alibaba#12206)" (alibaba#12396)
  Upgrade to 2.4.0 (alibaba#12384)
  Develop support ram info switch (alibaba#12382)
  Close derby ops api default. (alibaba#12372)
  Upgrade grpc to 1.64.2 (alibaba#12369)
  fix(alibaba#12333): fixed auth Plugin resource parser can't parser v2 config openAPI namespaceId. (alibaba#12336)
  Adjust integration tests for common modules in the core module to comply with checkstyle. (alibaba#12349)
  [IT]Adjust integration tests for cluster,code,smoke modules in the core module to comply with checkstyle. (alibaba#12350)
  fix [ISSUE alibaba#12323] , using the project's logback packagingData configuration instead of logback-nacos.xml's packagingData configuration (alibaba#12360)
  Remove the accessToken from the URL. (alibaba#12353)
  feat(alibaba#12355): Record the cost of ConfigDump in Prometheus. (alibaba#12356)
  [IT]Adjust core module auth integration tests to meet checkstyle requirements. (alibaba#12368)
  [ISSUE alibaba#12282]Fix the issue where monitoring data cannot be found through the IP dimension in the ListeningQuery (alibaba#12315)
  Adjust integration tests for ability, base, and client modules in the core module to comply with checkstyle. (alibaba#12335)
  Develop refactor request context (alibaba#12331)
  fix unexpect exception from NetworkInterface.ifUp (alibaba#12325)
  fix(alibaba#12231): When inserting and updating configurations in the database, the time-related field values need to be set using the time obtained from the database's built-in time function. (alibaba#12244)
  add some UT for default auth plugin (alibaba#12318)
  [ISSUE alibaba#12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题 (alibaba#12220)
  ...

# Conflicts:
#	plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/persistence/ExternalPermissionPersistServiceImpl.java
#	pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/Client Related to Nacos Client SDK kind/bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants