forcing sudo reboot. References #10

Addalin · Oct 10, 2019 · 4f6a0b0 · 4f6a0b0
1 parent 3e0092e
commit 4f6a0b0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/CameraNetwork/server.py b/CameraNetwork/server.py
@@ -1353,4 +1353,5 @@ def handle_reboot(self):
         logging.info("Performing reboot")
         logging.shutdown()
 
-        os.system('sudo reboot')
+        # TODO Long term fix
+        os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
diff --git a/scripts/start_server.py b/scripts/start_server.py
@@ -35,8 +35,8 @@
 ## OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ## ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.##
 """
-This script statrts the camera activity.
-Should be run at startup of the raspberry Pi.
+This script starts the camera activity.
+Should be run at startup of the raspberry Pi / Odroid XU4.
 """
 
 import argparse
@@ -138,7 +138,8 @@ def main():
         logging.exception('Failed starting the camera. Rebooting.')
         logging.shutdown()
         time.sleep(120)
-        os.system('sudo reboot')
+        # TODO Long term fix
+        os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
     except Exception as e:
         #
         # Failed starting the camera, might be some USB problem.
@@ -149,7 +150,8 @@ def main():
         logging.exception('Rebooting. Unkown error:\n{}'.format(repr(e)))
         logging.shutdown()
         time.sleep(120)
-        os.system('sudo reboot')
+        # TODO Long term fix
+        os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
 
 
 if __name__ == '__main__':
@@ -178,7 +180,8 @@ def main():
         logging.exception('Failed starting the camera. Rebooting.')
         logging.shutdown()
         time.sleep(120)
-        os.system('sudo reboot')
+        # TODO Long term fix
+        os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
     except Exception as e:
         #
         # Failed starting the camera, might be some USB problem.
@@ -189,4 +192,5 @@ def main():
         logging.exception('Rebooting. Unkown error:\n{}'.format(repr(e)))
         logging.shutdown()
         time.sleep(120)
-        os.system('sudo reboot')
+        # TODO Long term fix
+        os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
diff --git a/scripts/start_tunnel.py b/scripts/start_tunnel.py
@@ -59,7 +59,7 @@ def main():
         help='Skip starting the default tunnel')
     parser.add_argument(
         '--log_level',
-        default='INFO',
+        default='DEBUG',
         help='Set the log level (possible values: info, debug, ...)')
     args = parser.parse_args()
 
@@ -109,7 +109,8 @@ def main():
 
                 if failures_cnt > camera_settings[gs.INTERNET_FAILURE_THRESH]:
                     logging.error('Failed to connect 3G modem. Will reboot...')
-                    os.system('sudo reboot')
+                    # TODO Long term fix
+                    os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
 
                 logging.error(
                     'Failed to retrieve proxy parameters. will sleep and try again later.')
@@ -148,7 +149,8 @@ def main():
             logging.debug('Internet watchdog: failure number: %d.' % failures_cnt)
             if failures_cnt > camera_settings[gs.INTERNET_FAILURE_THRESH]:
                 logging.error('Failed to connect 3G modem. Will reboot...')
-                os.system('sudo reboot')
+                # TODO Long term fix
+                os.system('sync; sudo reboot -f')  # Changed from 'sudo reboot', workaround for reboot hanging
         else:
             logging.debug('Internet watchdog: succeed.')
             failures_cnt = 0