diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py
index a9d90ea0..1e7a98f1 100644
--- a/src/octoprint/cli/server.py
+++ b/src/octoprint/cli/server.py
@@ -81,8 +81,8 @@ def run_server(basedir, configfile, host, port, debug, allow_root, logging_confi
 		                           safe_mode=safe_mode,
                                    ignore_blacklist=ignore_blacklist,
 		                           after_safe_mode=log_startup,
-		                           after_plugin_manager=log_register_rollover)
-		
+		                           after_environment_detector=log_register_rollover)
+
 		settings, _, safe_mode, event_manager, connectivity_checker, plugin_manager, environment_detector = components
 
 	except FatalStartupError as e:
@@ -152,7 +152,7 @@ def enable_safemode(ctx, **kwargs):
 
 	settings.setBoolean(["server", "startOnceInSafeMode"], True)
 	settings.save()
-	
+
 	click.echo("Safe mode flag set, OctoPrint will start in safe mode on next restart.")
 
 
diff --git a/src/octoprint/logging/handlers.py b/src/octoprint/logging/handlers.py
index 7d106a4b..232216ee 100644
--- a/src/octoprint/logging/handlers.py
+++ b/src/octoprint/logging/handlers.py
@@ -27,7 +27,7 @@ class OctoPrintLogHandler(CleaningTimedRotatingFileHandler):
 	def doRollover(self):
 		CleaningTimedRotatingFileHandler.doRollover(self)
 
-		for rcb in self.__class__.rollover_callbacks:
+		for rcb in self.rollover_callbacks:
 			callback, args, kwargs = rcb
 			callback(*args, **kwargs)