Revert "disk_check updates: (sonic-net#1736)"

This reverts commit dd01b56.

Author: qiluo-msft

scripts/disk_check.py

@@ -33,23 +33,19 @@
 WORK_DIR = "/run/mount/work"
 MOUNTS_FILE = "/proc/mounts"
 
-chk_log_level = syslog.LOG_ERR
-
-def _log_msg(lvl, pfx, msg):
-    if lvl <= chk_log_level:
-        print("{}: {}".format(pfx, msg))
-        syslog.syslog(lvl, msg)
-
 def log_err(m):
-    _log_msg(syslog.LOG_ERR, "Err", m)
+    print("Err: {}".format(m), file=sys.stderr)
+    syslog.syslog(syslog.LOG_ERR, m)
 
 
 def log_info(m):
-    _log_msg(syslog.LOG_INFO, "Info",  m)
+    print("Info: {}".format(m))
+    syslog.syslog(syslog.LOG_INFO, m)
 
 
 def log_debug(m):
-    _log_msg(syslog.LOG_DEBUG, "Debug", m)
+    print("debug: {}".format(m))
+    syslog.syslog(syslog.LOG_DEBUG, m)
 
 
 def test_writable(dirs): 
@@ -139,19 +135,14 @@ def do_check(skip_mount, dirs):
 
 
 def main():
-    global chk_log_level
-
     parser=argparse.ArgumentParser(
             description="check disk for Read-Write and mount etc & home as Read-Write")
     parser.add_argument('-s', "--skip-mount", action='store_true', default=False,
             help="Skip mounting /etc & /home as Read-Write")
     parser.add_argument('-d', "--dirs", default="/etc,/home",
             help="dirs to mount")
-    parser.add_argument('-l', "--loglvl", default=syslog.LOG_ERR, type=int,
-            help="log level")
     args = parser.parse_args()
 
-    chk_log_level = args.loglvl
     ret = do_check(args.skip_mount, args.dirs.split(","))
     return ret
 

tests/disk_check_test.py

@@ -56,7 +56,6 @@
 }
 
 err_data = ""
-max_log_lvl = -1
 cmds = []
 current_tc = None
 
@@ -67,11 +66,6 @@ def mount_file(d):
 
 def report_err_msg(lvl, m):
     global err_data
-    global max_log_lvl
-
-    if lvl > max_log_lvl:
-        max_log_lvl = lvl
-
     if lvl == syslog.LOG_ERR:
         if err_data:
             err_data += "|"
@@ -129,16 +123,11 @@ def setup(self):
     @patch("disk_check.syslog.syslog")
     @patch("disk_check.subprocess.run")
     def test_readonly(self, mock_proc, mock_log):
-        global err_data, cmds, max_log_lvl
+        global err_data, cmds
 
         mock_proc.side_effect = mock_subproc_run
         mock_log.side_effect = report_err_msg
 
-        with patch('sys.argv', ["", "-l", "7", "-d", "/tmp"]):
-            disk_check.main()
-            assert max_log_lvl == syslog.LOG_DEBUG
-            max_log_lvl = -1
-
         for i, tc in test_data.items():
             print("-----------Start tc {}---------".format(i))
             init_tc(tc)
@@ -170,7 +159,3 @@ def test_readonly(self, mock_proc, mock_log):
                 assert err_data == tc["err"]
             assert cmds == tc.get("cmds", [])
             print("-----------End tc {}-----------".format(i))
-
-            
-        assert max_log_lvl == syslog.LOG_ERR
-