add defaults for policy/strategy

pgayvallet · pgayvallet · commit bbb96f4d2b45 · 2020-12-10T08:54:33.000+01:00
diff --git a/src/core/server/logging/appenders/rolling_file/policies/index.ts b/src/core/server/logging/appenders/rolling_file/policies/index.ts
@@ -18,6 +18,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import moment from 'moment-timezone';
 import { assertNever } from '@kbn/std';
 import { TriggeringPolicy } from './policy';
 import { RollingFileContext } from '../rolling_file_context';
@@ -43,10 +44,16 @@ export type TriggeringPolicyConfig =
   | SizeLimitTriggeringPolicyConfig
   | TimeIntervalTriggeringPolicyConfig;
 
-export const triggeringPolicyConfigSchema = schema.oneOf([
-  sizeLimitTriggeringPolicyConfigSchema,
-  timeIntervalTriggeringPolicyConfigSchema,
-]);
+const defaultPolicy: TimeIntervalTriggeringPolicyConfig = {
+  kind: 'time-interval',
+  interval: moment.duration(24, 'hour'),
+  modulate: true,
+};
+
+export const triggeringPolicyConfigSchema = schema.oneOf(
+  [sizeLimitTriggeringPolicyConfigSchema, timeIntervalTriggeringPolicyConfigSchema],
+  { defaultValue: defaultPolicy }
+);
 
 export const createTriggeringPolicy = (
   config: TriggeringPolicyConfig,
diff --git a/src/core/server/logging/appenders/rolling_file/policies/time_interval/time_interval_policy.ts b/src/core/server/logging/appenders/rolling_file/policies/time_interval/time_interval_policy.ts
@@ -54,7 +54,7 @@ export const timeIntervalTriggeringPolicyConfigSchema = schema.object({
     defaultValue: '24h',
     validate: (interval) => {
       if (!isValidRolloverInterval(interval)) {
-        return 'Interval value cannot overflow to a higher field.';
+        return 'Interval value cannot overflow to a higher time unit.';
       }
     },
   }),
diff --git a/src/core/server/logging/appenders/rolling_file/rolling_file_context.ts b/src/core/server/logging/appenders/rolling_file/rolling_file_context.ts
@@ -39,12 +39,12 @@ export class RollingFileContext {
       this.currentFileTime = birthtime.getTime();
       this.currentFileSize = size;
     } catch (e) {
-      this.currentFileTime = Date.now();
-      this.currentFileSize = 0;
       if (e.code !== 'ENOENT') {
         // eslint-disable-next-line no-console
-        console.log('[RollingFileAppender] error accessing the log file', e);
+        console.error('[RollingFileAppender] error accessing the log file', e);
       }
+      this.currentFileTime = Date.now();
+      this.currentFileSize = 0;
     }
   }
 }
diff --git a/src/core/server/logging/appenders/rolling_file/strategies/index.ts b/src/core/server/logging/appenders/rolling_file/strategies/index.ts
@@ -29,7 +29,15 @@ import { RollingFileContext } from '../rolling_file_context';
 export { RollingStrategy } from './strategy';
 export type RollingStrategyConfig = NumericRollingStrategyConfig;
 
-export const rollingStrategyConfigSchema = schema.oneOf([numericRollingStrategyConfigSchema]);
+const defaultStrategy: NumericRollingStrategyConfig = {
+  kind: 'numeric',
+  pattern: '-%i',
+  max: 7,
+};
+
+export const rollingStrategyConfigSchema = schema.oneOf([numericRollingStrategyConfigSchema], {
+  defaultValue: defaultStrategy,
+});
 
 export const createRollingStrategy = (
   config: RollingStrategyConfig,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export const timeIntervalTriggeringPolicyConfigSchema = schema.object({`
`54`	`54`	`defaultValue: '24h',`
`55`	`55`	`validate: (interval) => {`
`56`	`56`	`if (!isValidRolloverInterval(interval)) {`
`57`		`- return 'Interval value cannot overflow to a higher field.';`
	`57`	`+ return 'Interval value cannot overflow to a higher time unit.';`
`58`	`58`	`}`
`59`	`59`	`},`
`60`	`60`	`}),`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ export class RollingFileContext {`
`39`	`39`	`this.currentFileTime = birthtime.getTime();`
`40`	`40`	`this.currentFileSize = size;`
`41`	`41`	`} catch (e) {`
`42`		`- this.currentFileTime = Date.now();`
`43`		`- this.currentFileSize = 0;`
`44`	`42`	`if (e.code !== 'ENOENT') {`
`45`	`43`	`// eslint-disable-next-line no-console`
`46`		`- console.log('[RollingFileAppender] error accessing the log file', e);`
	`44`	`+ console.error('[RollingFileAppender] error accessing the log file', e);`
`47`	`45`	`}`
	`46`	`+ this.currentFileTime = Date.now();`
	`47`	`+ this.currentFileSize = 0;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`