summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-10-29 16:58:36 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-10-29 16:58:36 +0200
commitdb1e84d34e910812d494673a1d78d85f38e2b725 (patch)
treeaaa239e8292bdf539e5ca316fef181539d4b359f
parentd608ccbd6d8d1d3dbbe8660d22b6a329df71da63 (diff)
downloadpoezio-db1e84d34e910812d494673a1d78d85f38e2b725.tar.gz
poezio-db1e84d34e910812d494673a1d78d85f38e2b725.tar.bz2
poezio-db1e84d34e910812d494673a1d78d85f38e2b725.tar.xz
poezio-db1e84d34e910812d494673a1d78d85f38e2b725.zip
Daemon now reads from a pipe and not in the fifo directly
-rwxr-xr-xsrc/daemon.py41
1 files changed, 14 insertions, 27 deletions
diff --git a/src/daemon.py b/src/daemon.py
index a9d888f1..f23d6b5f 100755
--- a/src/daemon.py
+++ b/src/daemon.py
@@ -1,3 +1,4 @@
+#/usr/bin/env python3
# Copyright 2011 Florent Le Coz <louiz@louiz.org>
#
# This file is part of Poezio.
@@ -6,15 +7,13 @@
# it under the terms of the zlib license. See the COPYING file.
"""
-This file is a standalone program that creates a fifo file (if it doesn’t exist
-yet), opens it for reading, reads commands from it and executes them (each line
-should be a command).
+This file is a standalone program that reads commands on
+stdin and executes them (each line should be a command).
-Usage: ./daemon.py <path_tofifo>
+Usage: cat some_fifo | ./daemon.py
-That fifo should be in a directory, shared through sshfs, with the remote
-machine running poezio. Poezio then writes command in it, and this daemon
-executes them on the local machine.
+Poezio writes commands in the fifo, and this daemon executes them on the
+local machine.
Note that you should not start this daemon if you do not trust the remote
machine that is running poezio, since this could make it run any (dangerous)
command on your local machine.
@@ -24,8 +23,6 @@ import sys
import threading
import subprocess
-from fifo import Fifo
-
class Executor(threading.Thread):
"""
Just a class to execute commands in a thread.
@@ -38,26 +35,16 @@ class Executor(threading.Thread):
self.command = command
def run(self):
- print('executing %s' % (self.command,))
+ print('executing %s' % (self.command.strip(),))
subprocess.call(self.command.split())
-def main(path):
+def main():
while True:
- fifo = Fifo(path, 'r')
- while True:
- line = fifo.readline()
- if line == '':
- del fifo
- break
- e = Executor(line)
- e.start()
-
-def usage():
- print('Usage: %s <fifo_name>' % (sys.argv[0],))
+ line = sys.stdin.readline()
+ if line == '':
+ break
+ e = Executor(line)
+ e.start()
if __name__ == '__main__':
- argc = len(sys.argv)
- if argc != 2:
- usage()
- else:
- main(sys.argv[1])
+ main()