1 files changed, 13 insertions, 9 deletions
diff --git a/azurelinuxagent/distro/default/init.py b/azurelinuxagent/distro/default/init.py
index db74fef..c703e87 100644
--- a/azurelinuxagent/distro/default/init.py
+++ b/azurelinuxagent/distro/default/init.py
@@ -20,30 +20,34 @@
 import os
 import azurelinuxagent.conf as conf
 import azurelinuxagent.logger as logger
-from azurelinuxagent.utils.osutil import OSUTIL
-import azurelinuxagent.utils.fileutil as fileutil
+import azurelinuxagent.event as event
 
 
 class InitHandler(object):
-    def init(self, verbose):
+    def __init__(self, distro):
+        self.distro = distro
+
+    def run(self, verbose):
         #Init stdout log
         level = logger.LogLevel.VERBOSE if verbose else logger.LogLevel.INFO
         logger.add_logger_appender(logger.AppenderType.STDOUT, level)
 
         #Init config
-        conf_file_path = OSUTIL.get_conf_file_path()
-        conf.load_conf(conf_file_path)
+        conf_file_path = self.distro.osutil.get_agent_conf_file_path()
+        conf.load_conf_from_file(conf_file_path)
 
         #Init log
-        verbose = verbose or conf.get_switch("Logs.Verbose", False)
+        verbose = verbose or conf.get_logs_verbose()
         level = logger.LogLevel.VERBOSE if verbose else logger.LogLevel.INFO
         logger.add_logger_appender(logger.AppenderType.FILE, level,
                                  path="/var/log/waagent.log")
         logger.add_logger_appender(logger.AppenderType.CONSOLE, level,
                                  path="/dev/console")
 
-        #Create lib dir
-        fileutil.mkdir(OSUTIL.get_lib_dir(), mode=0o700)
-        os.chdir(OSUTIL.get_lib_dir())
+        #Init event reporter
+        event_dir = os.path.join(conf.get_lib_dir(), "events")
+        event.init_event_logger(event_dir)
+        event.enable_unhandled_err_dump("WALA")
+