Fix logging from syslog to logger

Author: mprabhu-nokia

files/scripts/asic_status.py

@@ -5,21 +5,25 @@
 """
 try:
     import re
-    import syslog
     import sys
     from sonic_py_common import daemon_base
     from swsscommon import swsscommon
     from sonic_py_common import multi_asic
+    from sonic_py_common.logger import Logger
 except ImportError as e:
     raise ImportError(str(e) + " - required module not found")
 
 #
 # Constants ====================================================================
 #
+SYSLOG_IDENTIFIER = 'asic_status.py'
 CHASSIS_ASIC_INFO_TABLE = 'CHASSIS_ASIC_TABLE'
 SELECT_TIMEOUT_MSECS = 5000
 
 def main():
+    logger = Logger(SYSLOG_IDENTIFIER)
+    logger.set_min_log_priority_info()
+
     if len(sys.argv) != 3:
         raise Exception('Pass service and valid asic-id as arguments')
 
@@ -29,8 +33,7 @@ def main():
     # Get num asics
     num_asics = multi_asic.get_num_asics()
     if num_asics == 0:
-        syslog.syslog(syslog.LOG_ERR,
-                'Detected no asics on this platform for service {}'.format(service))
+        logger.log_error('Detected no asics on this platform for service {}'.format(service))
         sys.exit(1)
 
     # Connect to STATE_DB and subscribe to chassis-module table notifications
@@ -55,22 +58,18 @@ def main():
             asic_fvs = dict(asic_fvp)
             asic_name = asic_fvs.get('name')
             if asic_name is None:
-                syslog.syslog(syslog.LOG_INFO,
-                        'Unable to get asic_name for asic{}'.format(global_asic_id))
+                logger.log_info('Unable to get asic_name for asic{}'.format(global_asic_id))
                 continue
 
             if asic_name.startswith('FABRIC-CARD') is False:
-                syslog.syslog(syslog.LOG_INFO,
-                        'Skipping module with asic_name {} for asic{}'.format(asic_name, global_asic_id))
+                logger.log_info('Skipping module with asic_name {} for asic{}'.format(asic_name, global_asic_id))
                 continue
 
             if (global_asic_id == args_asic_id):
-                syslog.syslog(syslog.LOG_INFO,
-                        'Detected asic{} is online'.format(global_asic_id))
+                logger.log_info('Detected asic{} is online'.format(global_asic_id))
                 sys.exit(0)
         elif asic_op == 'DEL':
-            syslog.syslog(syslog.LOG_INFO,
-                    'Detected asic{} is offline'.format(global_asic_id))
+            logger.log_info('Detected asic{} is offline'.format(global_asic_id))
             sys.exit(1)
         else:
             continue

files/scripts/lldp.sh

@@ -11,16 +11,18 @@ function debug()
 start() {
     debug "Starting ${SERVICE}$DEV service..."
 
-    # start service docker
+    # On supervisor card, skip starting asic related services here. In wait(),
+    # wait until the asic is detected by pmon and published via database.
     if ! is_chassis_supervisor; then
+        # start service docker
         /usr/bin/${SERVICE}.sh start $DEV
         debug "Started ${SERVICE}$DEV service..."
     fi
 }
 
 wait() {
+    # On supervisor card, wait for asic to be online before starting the docker.
     if is_chassis_supervisor; then
-        # Check asic status before starting docker
         check_asic_status
         ASIC_STATUS=$?
 

files/scripts/swss.sh

@@ -160,8 +160,10 @@ start() {
         clean_up_tables STATE_DB "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'LAG_TABLE*', 'LAG_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*', 'FDB_TABLE*', 'FG_ROUTE_TABLE*', 'BUFFER_POOL*', 'BUFFER_PROFILE*', 'MUX_CABLE_TABLE*'"
     fi
 
-    # start service docker
+    # On supervisor card, skip starting asic related services here. In wait(),
+    # wait until the asic is detected by pmon and published via database.
     if ! is_chassis_supervisor; then
+        # start service docker
         /usr/bin/${SERVICE}.sh start $DEV
         debug "Started ${SERVICE}$DEV service..."
     fi
@@ -171,8 +173,8 @@ start() {
 }
 
 wait() {
+    # On supervisor card, wait for asic to be online before starting the docker.
     if is_chassis_supervisor; then
-        # Check asic status before starting docker
         check_asic_status
         ASIC_STATUS=$?
 

files/scripts/syncd_common.sh

@@ -106,8 +106,10 @@ start() {
 
     startplatform
 
-    # start service docker
+    # On supervisor card, skip starting asic related services here. In wait(),
+    # wait until the asic is detected by pmon and published via database.
     if ! is_chassis_supervisor; then
+        # start service docker
         /usr/bin/${SERVICE}.sh start $DEV
         debug "Started ${SERVICE}$DEV service..."
     fi
@@ -116,8 +118,8 @@ start() {
 }
 
 wait() {
+    # On supervisor card, wait for asic to be online before starting the docker.
     if is_chassis_supervisor; then
-        # Check asic status before starting docker
         check_asic_status
         ASIC_STATUS=$?
 

files/scripts/teamd.sh

@@ -50,16 +50,18 @@ start() {
     debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
     debug "Fast boot flag: ${SERVICE}$DEV ${Fast_BOOT}."
 
-    # start service docker
+    # On supervisor card, skip starting asic related services here. In wait(),
+    # wait until the asic is detected by pmon and published via database.
     if ! is_chassis_supervisor; then
+        # start service docker
         /usr/bin/${SERVICE}.sh start $DEV
         debug "Started ${SERVICE}$DEV service..."
     fi
 }
 
 wait() {
+    # On supervisor card, wait for asic to be online before starting the docker.
     if is_chassis_supervisor; then
-        # Check asic status before starting docker
         check_asic_status
         ASIC_STATUS=$?