github
/
nginxconfig.io
mirror of https://github.com/digitalocean/nginxconfig.io
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(logging): retain the user values for error_log when toggling the log on/off

pull/399/head
Kobi Meirson 2022-11-13 16:51:26 +02:00
parent b8960c3443
commit 476a9bcfdf
No known key found for this signature in database
GPG Key ID: 5D66F732B037CDE1
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nginxconfig/generators/conf/nginx.conf.js
View File

@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
import { errorLogPathDisabled } from '../../util/logging';
import sslProfiles from '../../util/ssl_profiles'; import sslProfiles from '../../util/ssl_profiles';
import websiteConf from './website.conf'; import websiteConf from './website.conf';
@ -112,7 +113,7 @@ export default (domains, global) => {
config.http.push(['error_log', global.logging.errorLogPath.computed.trim() + config.http.push(['error_log', global.logging.errorLogPath.computed.trim() +
` ${global.logging.errorLogLevel.computed}`]); ` ${global.logging.errorLogLevel.computed}`]);
} else { } else {
config.http.push(['error_log', '/dev/null']); config.http.push(['error_log', errorLogPathDisabled]);
} }
if (global.security.limitReq.computed) { if (global.security.limitReq.computed) {

6
src/nginxconfig/templates/domain_sections/logging.vue
View File

@ -154,7 +154,7 @@ THE SOFTWARE.
<script> <script>
import delegatedFromDefaults from '../../util/delegated_from_defaults'; import delegatedFromDefaults from '../../util/delegated_from_defaults';
import computedFromDefaults from '../../util/computed_from_defaults'; import computedFromDefaults from '../../util/computed_from_defaults';
import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogLevelDefault, errorLogLevelOptions, errorLogLevelDisabled } from '../../util/logging'; import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogPathDisabled, errorLogLevelDefault, errorLogLevelOptions, errorLogLevelDisabled } from '../../util/logging';
import PrettyCheck from '../inputs/checkbox'; import PrettyCheck from '../inputs/checkbox';
import PrettyRadio from '../inputs/radio'; import PrettyRadio from '../inputs/radio';
@ -213,10 +213,10 @@ THE SOFTWARE.
// disable `error_log` path selection if log level is set to `none` // disable `error_log` path selection if log level is set to `none`
if (data.computed === errorLogLevelDisabled) { if (data.computed === errorLogLevelDisabled) {
this.$props.data.errorLogPath.enabled = false; this.$props.data.errorLogPath.enabled = false;
this.$props.data.errorLogPath.value = '/dev/null'; this.$props.data.errorLogPath.computed = errorLogPathDisabled;
} else if (!this.$props.data.errorLogPath.enabled) { } else if (!this.$props.data.errorLogPath.enabled) {
this.$props.data.errorLogPath.enabled = true; this.$props.data.errorLogPath.enabled = true;
this.$props.data.errorLogPath.value = this.$props.data.errorLogPath.default; this.$props.data.errorLogPath.computed = this.$props.data.errorLogPath.value;
} }
}, },
deep: true, deep: true,

1
src/nginxconfig/util/logging.js
View File

@ -28,6 +28,7 @@ export const accessLogPathDefault = '/var/log/nginx/access.log';
export const accessLogParamsDefault = 'buffer=512k flush=1m'; export const accessLogParamsDefault = 'buffer=512k flush=1m';
export const errorLogPathDefault = '/var/log/nginx/error.log'; export const errorLogPathDefault = '/var/log/nginx/error.log';
export const errorLogPathDisabled = '/dev/null';
export const errorLogLevelDefault = 'warn'; export const errorLogLevelDefault = 'warn';
export const errorLogLevelOptions = Object.freeze(['debug', 'info', 'notice', 'warn', 'error', 'crit', 'alert', 'emerg']); export const errorLogLevelOptions = Object.freeze(['debug', 'info', 'notice', 'warn', 'error', 'crit', 'alert', 'emerg']);
export const errorLogLevelDisabled = 'none'; export const errorLogLevelDisabled = 'none';

4
src/nginxconfig/util/vue_backwards_compatibility.js
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
import isObject from './is_object'; import isObject from './is_object';
import deepMerge from './deep_merge'; import deepMerge from './deep_merge';
import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogLevelDefault } from './logging'; import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogPathDisabled, errorLogLevelDefault } from './logging';
import { serverDomainDefault } from './defaults'; import { serverDomainDefault } from './defaults';
// Migrate old logging settings to new ones // Migrate old logging settings to new ones
@ -45,7 +45,7 @@ const migrateLogging = data => {
const [globalErrorLogPath, ...globalErrorLogLevel] = (globalLogging.errorLog || `${errorLogPathDefault} ${errorLogLevelDefault}`).split(' '); const [globalErrorLogPath, ...globalErrorLogLevel] = (globalLogging.errorLog || `${errorLogPathDefault} ${errorLogLevelDefault}`).split(' ');
const globalErrorLogEnabled = const globalErrorLogEnabled =
!('errorLog' in globalLogging) || // errorLog was enabled by default and might not appear at all !('errorLog' in globalLogging) || // errorLog was enabled by default and might not appear at all
(globalErrorLogPath !== '' && globalErrorLogPath !== '/dev/null'); // *or* someone turned it off explicitly (globalErrorLogPath !== '' && globalErrorLogPath !== errorLogPathDisabled); // *or* someone turned it off explicitly
// set global access_log / error_log files for every domain UNLESS it was explicitly // set global access_log / error_log files for every domain UNLESS it was explicitly
// enabled for the domain // enabled for the domain