Create wrapper class that handles launching the lemonbar process
and in and out threads
This commit is contained in:
@@ -11,9 +11,6 @@ import i3_lemonbar_common as common
|
||||
import i3_lemonbar_modules as modules
|
||||
import i3_lemonbar_parser as lemonparser
|
||||
|
||||
p_conky_slow = None
|
||||
p_lemonbar = None
|
||||
|
||||
def assert_only_instance():
|
||||
"""
|
||||
If PID file exists:
|
||||
@@ -85,7 +82,6 @@ def clean_up():
|
||||
common.logger.debug('Cleaning up')
|
||||
nice_delete(config.pid_file)
|
||||
nice_delete(config.fifo_file_status)
|
||||
nice_term(p_conky_slow)
|
||||
modules.stop_all()
|
||||
os._exit(0)
|
||||
|
||||
@@ -95,89 +91,98 @@ def keep_fifo_open():
|
||||
fifo_write.write('HEARTBEAT\n')
|
||||
time.sleep(30)
|
||||
|
||||
def put_fifo_in_queue():
|
||||
with open(config.fifo_file_status, 'r', buffering=1) as fifo_read:
|
||||
# Let parser read from fifo
|
||||
common.logger.debug("FIFO {} opened for reading".format(config.fifo_file_status))
|
||||
class LemonbarWrapper:
|
||||
|
||||
while True:
|
||||
try:
|
||||
data = fifo_read.readline() # Blocking read
|
||||
if len(data) == 0:
|
||||
common.logger.debug("Writer closed")
|
||||
break
|
||||
data = data.rstrip() # Remove trailing newlines
|
||||
common.bar_in_shelf.put(lemonparser.parse_line(data))
|
||||
except BrokenPipeError:
|
||||
common.logger.debug('Broken pipe in parse status thread, exiting')
|
||||
common.health_logger.info('Broken pipe in parse status thread, exiting')
|
||||
clean_up()
|
||||
except:
|
||||
common.logger.debug('Unknown exception in parse status thread, exiting')
|
||||
common.health_logger.info('Unknown exception in parse status thread, exiting')
|
||||
clean_up()
|
||||
def __init__(self, only_instance = True):
|
||||
assert only_instance, 'Multiple instances not supported' # TODO
|
||||
assert_only_instance() # Creates pid file and fifo file
|
||||
|
||||
def write_parsed():
|
||||
# Write parse entries in queue to lemonbar
|
||||
global p_lemonbar
|
||||
p_lemonbar = subprocess.Popen(config.lemonbar_args, stdin=subprocess.PIPE
|
||||
, stdout=subprocess.PIPE, text=True)
|
||||
self.buffer_in = common.Shelf()
|
||||
self.all_threads = []
|
||||
|
||||
while True:
|
||||
data = common.bar_in_shelf.get() # Blocking read
|
||||
p_lemonbar.stdin.write(data + '\n')
|
||||
p_lemonbar.stdin.flush()
|
||||
#common.logger.debug('Read: "{0}"'.format(data))
|
||||
#common.logger.debug('Parsed "{0}"'.format(psd))
|
||||
# Start writing and reading threads
|
||||
# Create readers before writers
|
||||
self.p_lemonbar = subprocess.Popen(config.lemonbar_args, stdin=subprocess.PIPE
|
||||
, stdout=subprocess.PIPE, text=True)
|
||||
self.start_thread(target = self.exec_commands, desc='Execute commands thread')
|
||||
self.start_thread(target = self.write_parsed, desc='Write parsed status thread')
|
||||
self.start_thread(target = keep_fifo_open, desc='Keep fifo open thread')
|
||||
self.start_thread(target = self.put_fifo_in_queue, desc='Put fifo entries in queue thread')
|
||||
modules.start_all(self)
|
||||
|
||||
def exec_commands():
|
||||
global p_lemonbar
|
||||
common.logger.debug('Threads started')
|
||||
|
||||
# Wait until up TODO better solution
|
||||
while True:
|
||||
if p_lemonbar is not None:
|
||||
break
|
||||
while True:
|
||||
data = p_lemonbar.stdout.readline()
|
||||
if not data:
|
||||
common.logger.debug('Lemonbar closed, exiting')
|
||||
common.health_logger.info('Lemonbar closed, exiting')
|
||||
clean_up()
|
||||
break
|
||||
# Helpers to start threads
|
||||
def start_thread(self, target, desc):
|
||||
# Wrapper around arbitrary target
|
||||
def run_thread(target, desc):
|
||||
target()
|
||||
common.health_logger.info('"%s" reached end', desc)
|
||||
|
||||
common.logger.debug('Trying reading: "{0}"'.format(data.strip('\n')))
|
||||
try:
|
||||
modules.do_action(data)
|
||||
thread = Thread(target = run_thread, args=(target, desc))
|
||||
|
||||
except Exception as e:
|
||||
common.logger.debug('Exception occured executing command\n Line in: {}'.format(data))
|
||||
common.logger.debug(str(e))
|
||||
if len(data) == 0:
|
||||
common.logger.debug("Lemonbar output closed")
|
||||
break
|
||||
common.logger.debug('Read: "{0}"'.format(data.strip('\n')))
|
||||
|
||||
|
||||
class i3_thread:
|
||||
""" Helper class to start and stop threads"""
|
||||
all_threads = [] # Static, contains all started threads
|
||||
|
||||
def __init__(self, target, desc):
|
||||
self.thread = Thread(target = self.__class__.run, args=(target,desc))
|
||||
self.desc = desc
|
||||
|
||||
self.all_threads.append(self)
|
||||
self.all_threads.append(thread)
|
||||
common.health_logger.info('"%s" starting', desc)
|
||||
self.thread.start()
|
||||
thread.start()
|
||||
|
||||
# Wrapper around the target
|
||||
def run(target, desc):
|
||||
target()
|
||||
common.health_logger.info('"%s" reached end', desc)
|
||||
def join(self):
|
||||
for thread in self.all_threads:
|
||||
thread.join()
|
||||
|
||||
def join_threads():
|
||||
for i3_th in i3_thread.all_threads:
|
||||
i3_th.thread.join()
|
||||
# Thread targets
|
||||
def write_parsed(self):
|
||||
# Write parse entries in queue to lemonbar
|
||||
while True:
|
||||
data = self.buffer_in.get() # Blocking read
|
||||
self.p_lemonbar.stdin.write(data + '\n')
|
||||
self.p_lemonbar.stdin.flush()
|
||||
#common.logger.debug('Read: "{0}"'.format(data))
|
||||
#common.logger.debug('Parsed "{0}"'.format(psd))
|
||||
|
||||
def exec_commands(self):
|
||||
while True:
|
||||
data = self.p_lemonbar.stdout.readline()
|
||||
if not data:
|
||||
common.logger.debug('Lemonbar closed, exiting')
|
||||
common.health_logger.info('Lemonbar closed, exiting')
|
||||
clean_up()
|
||||
break
|
||||
|
||||
common.logger.debug('Trying reading: "{0}"'.format(data.strip('\n')))
|
||||
try:
|
||||
modules.do_action(data)
|
||||
|
||||
except Exception as e:
|
||||
common.logger.debug('Exception occured executing command\n Line in: {}'.format(data))
|
||||
common.logger.debug(str(e))
|
||||
if len(data) == 0:
|
||||
common.logger.debug("Lemonbar output closed")
|
||||
break
|
||||
common.logger.debug('Read: "{0}"'.format(data.strip('\n')))
|
||||
|
||||
def put_fifo_in_queue(self):
|
||||
with open(config.fifo_file_status, 'r', buffering=1) as fifo_read:
|
||||
# Let parser read from fifo
|
||||
common.logger.debug("FIFO {} opened for reading".format(config.fifo_file_status))
|
||||
|
||||
while True:
|
||||
try:
|
||||
data = fifo_read.readline() # Blocking read
|
||||
if len(data) == 0:
|
||||
common.logger.debug("Writer closed")
|
||||
break
|
||||
data = data.rstrip() # Remove trailing newlines
|
||||
self.buffer_in.put(lemonparser.parse_line(data))
|
||||
except BrokenPipeError:
|
||||
common.logger.debug('Broken pipe in parse status thread, exiting')
|
||||
common.health_logger.info('Broken pipe in parse status thread, exiting')
|
||||
clean_up()
|
||||
except Exception as e:
|
||||
common.logger.debug('Unknown exception in parse status thread, exiting')
|
||||
common.health_logger.info('Unknown exception in parse status thread, exiting')
|
||||
raise
|
||||
common.logger.debug(str(e))
|
||||
clean_up()
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
@@ -205,23 +210,11 @@ if __name__ == "__main__":
|
||||
common.health_logger = logging.getLogger('Health logger')
|
||||
common.health_logger.addHandler(handler)
|
||||
|
||||
# Make sure no other instance running and ensure clean up on exit
|
||||
assert_only_instance() # Creates pid file and fifo file
|
||||
# Ensure clean up on exit
|
||||
atexit.register(clean_up)
|
||||
signal.signal(signal.SIGTERM, handle_exit)
|
||||
signal.signal(signal.SIGINT, handle_exit)
|
||||
|
||||
common.bar_in_shelf = common.Shelf()
|
||||
|
||||
# Start writing and reading threads
|
||||
# Create readers before writers
|
||||
i3_thread(target = exec_commands, desc='Exec commands thread')
|
||||
i3_thread(target = write_parsed, desc='Write parsed status thread')
|
||||
i3_thread(target = keep_fifo_open, desc='')
|
||||
i3_thread(target = put_fifo_in_queue, desc='')
|
||||
modules.start_all()
|
||||
|
||||
common.logger.debug('Threads started')
|
||||
i3_thread.join_threads()
|
||||
|
||||
# Start the lemonbar wrapper
|
||||
LemonbarWrapper().join()
|
||||
common.logger.debug('Reached end')
|
||||
|
||||
Reference in New Issue
Block a user