Change rotation to timed, rather than size

Author: benjaminjb

internal/controller/standalone_pgadmin/pod.go

@@ -381,7 +381,10 @@ func startupCommand(ctx context.Context, inPgadmin *v1beta1.PGAdmin) []string {
 	)
 	var (
 		maxBackupRetentionNumber = "1"
-		retentionPeriod          = "24 * 60"
+		// One day in minutes for pgadmin rotation
+		pgAdminRetentionPeriod = "24 * 60"
+		// Daily rotation for gunicorn rotation
+		gunicornRetentionPeriod = "D"
 	)
 
 	// If the OpenTelemetryLogs Feature is enabled and the user has set a retention period,
@@ -398,7 +401,10 @@ func startupCommand(ctx context.Context, inPgadmin *v1beta1.PGAdmin) []string {
 		// for the currently-used log file.
 		maxBackupRetentionNumber = strconv.Itoa(retentionNumber - 1)
 		if period == "hourly" {
-			retentionPeriod = "60"
+			// If the period is hourly, set the pgadmin
+			// and gunicorn retention periods to hourly.
+			pgAdminRetentionPeriod = "60"
+			gunicornRetentionPeriod = "H"
 		}
 	}
 
@@ -420,7 +426,7 @@ if os.path.isfile('` + configDatabaseURIPathAbsolutePath + `'):
 
 DATA_DIR = '` + dataMountPath + `'
 LOG_FILE = '` + LogFileAbsolutePath + `'
-LOG_ROTATION_AGE = ` + retentionPeriod + ` # minutes
+LOG_ROTATION_AGE = ` + pgAdminRetentionPeriod + ` # minutes
 LOG_ROTATION_SIZE = 5 # MiB
 LOG_ROTATION_MAX_LOG_FILES = ` + maxBackupRetentionNumber + `
 
@@ -455,9 +461,11 @@ logconfig_dict = copy.deepcopy(gunicorn.glogging.CONFIG_DEFAULTS)
 logconfig_dict['loggers']['gunicorn.access']['handlers'] = ['file']
 logconfig_dict['loggers']['gunicorn.error']['handlers'] = ['file']
 logconfig_dict['handlers']['file'] = {
-  'class': 'logging.handlers.RotatingFileHandler',
+  'class': 'logging.handlers.TimedRotatingFileHandler',
   'filename': '` + GunicornLogFileAbsolutePath + `',
-  'backupCount': ` + maxBackupRetentionNumber + `, 'maxBytes': 2 << 20, # MiB
+  'backupCount': ` + maxBackupRetentionNumber + `,
+  'interval': 1, # every one unit (defined by when), rotate
+  'when': '` + gunicornRetentionPeriod + `',
   'formatter': 'json',
 }
 logconfig_dict['formatters']['json'] = {

internal/controller/standalone_pgadmin/pod_test.go

@@ -181,9 +181,11 @@ initContainers:
     logconfig_dict['loggers']['gunicorn.access']['handlers'] = ['file']
     logconfig_dict['loggers']['gunicorn.error']['handlers'] = ['file']
     logconfig_dict['handlers']['file'] = {
-      'class': 'logging.handlers.RotatingFileHandler',
+      'class': 'logging.handlers.TimedRotatingFileHandler',
       'filename': '/var/lib/pgadmin/logs/gunicorn.log',
-      'backupCount': 1, 'maxBytes': 2 << 20, # MiB
+      'backupCount': 1,
+      'interval': 1, # every one unit (defined by when), rotate
+      'when': 'D',
       'formatter': 'json',
     }
     logconfig_dict['formatters']['json'] = {
@@ -414,9 +416,11 @@ initContainers:
     logconfig_dict['loggers']['gunicorn.access']['handlers'] = ['file']
     logconfig_dict['loggers']['gunicorn.error']['handlers'] = ['file']
     logconfig_dict['handlers']['file'] = {
-      'class': 'logging.handlers.RotatingFileHandler',
+      'class': 'logging.handlers.TimedRotatingFileHandler',
       'filename': '/var/lib/pgadmin/logs/gunicorn.log',
-      'backupCount': 11, 'maxBytes': 2 << 20, # MiB
+      'backupCount': 11,
+      'interval': 1, # every one unit (defined by when), rotate
+      'when': 'H',
       'formatter': 'json',
     }
     logconfig_dict['formatters']['json'] = {