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

PAYARA-1509 condition for access logger may be read in from domain.xml #1473

Merged

Conversation

Cousjava
Copy link
Contributor

fixes #1450

@Cousjava
Copy link
Contributor Author

Jenkins, would you kindly?

@payara-ci
Copy link
Contributor

All tests have passed

@@ -74,6 +75,13 @@ public ConfigBeansUtilities(Applications paramApps, Domain paramDomain) {
domain = paramDomain;
}

/*
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this change needed if the default if not available will be null anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wrote it this way to match how others are set, and I'm not sure if the default condition is meant to be null - the other defaults mention that they come from a dtd which I have not been able to find.

@@ -908,6 +908,14 @@ void updateAccessLogAttributes(HttpService httpService,
historyFiles = new LinkedList<File>();
}

//Conditional access log
if (accessLogConfig != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why check if not null and then do an else that sets it to null. Why not just set it regardless and not bother with the getDefaultCondition change?

@mulderbaba mulderbaba added this to the Payara 172 milestone Mar 23, 2017
@smillidge smillidge merged commit db5a8b2 into payara:master Mar 25, 2017
@Cousjava Cousjava deleted the PAYARA-1509-conditional-access-logging branch April 19, 2017 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support conditional Access Logs
5 participants