Simplify running module to fix stdout buffering issue with supervisor.

pacifickashyap · Feb 11, 2015 · daaafed · daaafed
1 parent 71cd1ad
commit daaafed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Adafruit_Video_Looper/__init__.py b/Adafruit_Video_Looper/__init__.py
@@ -1,2 +1,2 @@
-# Import main program.
-from .video_looper import main
+
+
diff --git a/Adafruit_Video_Looper/video_looper.py b/Adafruit_Video_Looper/video_looper.py
@@ -214,7 +214,7 @@ def signal_quit(self, signal, frame):
 
 
 # Main entry point.
-def main():
+if __name__ == '__main__':
     print('Starting Adafruit Video Looper.')
     # Default config path to /boot.
     config_path = '/boot/video_looper.ini'

diff --git a/setup.py b/setup.py
@@ -10,5 +10,4 @@
       license           = 'GNU GPLv2',
       url               = 'https://github.com/adafruit/pi_video_looper',
       install_requires  = ['pyudev'],
-      packages          = find_packages(),
-      entry_points      = {'console_scripts': ['video_looper = Adafruit_Video_Looper:main']})
+      packages          = find_packages())
diff --git a/video_looper.conf b/video_looper.conf
@@ -1,7 +1,7 @@
 # Supervisord configuration to run video looper at boot and
 # ensure it runs continuously.
 [program:video_looper]
-command=video_looper
+command=python -u -m Adafruit_Video_Looper.video_looper
 autostart=true
 autorestart=unexpected
 startsecs=5
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		# Import main program.
		from .video_looper import main