Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Hacksaar
Sphinx
Commits
e5699318
Commit
e5699318
authored
Dec 04, 2013
by
Constantin
Browse files
tidied up fire_and_forget_cmd for sound playing
parent
b43971d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
libtuer.py
View file @
e5699318
...
...
@@ -71,12 +71,13 @@ def fire_and_forget(f):
# run a command asynchronously and log the return value if not 0
# prefix must be a string identifying the code position where the call came from
def
fire_and_forget_cmd
(
cmd
,
log
,
prefix
):
def
fire_and_forget_cmd
(
cmd
,
log_prefix
):
logger
.
debug
(
"Firing and forgetting command from %s: %s"
%
(
log_prefix
,
str
(
cmd
)))
def
_fire_and_forget_cmd
():
with
open
(
"/dev/null"
,
"w"
)
as
fnull
:
retcode
=
subprocess
.
call
(
cmd
,
stdout
=
fnull
,
stderr
=
fnull
)
if
retcode
is
not
0
:
logger
.
error
(
"%sReturn code %d at command: %s"
%
(
prefix
,
retcode
,
str
(
cmd
)))
logger
.
error
(
"%sReturn code %d at command: %s"
%
(
log_
prefix
,
retcode
,
str
(
cmd
)))
fire_and_forget
(
_fire_and_forget_cmd
)
# Threaded callback class
...
...
statemachine.py
View file @
e5699318
...
...
@@ -11,7 +11,7 @@ def play_sound (what):
logger
.
error
(
"StateMachine: Unable to list sound files in %s"
%
(
SOUNDS_DIRECTORY
+
what
))
return
soundfile
=
SOUNDS_DIRECTORY
+
what
+
'/'
+
random
.
choice
(
soundfiles
)
fire_and_forget_cmd
([
SOUNDS_PLAYER
,
soundfile
],
logger
.
error
,
"StateMachine: "
)
fire_and_forget_cmd
([
SOUNDS_PLAYER
,
soundfile
],
"StateMachine: "
)
# convert an absolute nervlist to a relative one
def
nervlist_abs2rel
(
nervlist_abs
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment