Skip to content

Commit

Permalink
Make init scripts Python version agnostic
Browse files Browse the repository at this point in the history
Now that the Tautulli will run on both major versions of Python we can 
remove the specificity in the init scripts and make them simpler, with 
the added advantage that some OS's will now run Tautulli through Python 
3 instead of Python 2.
  • Loading branch information
Arcanemagus committed Mar 28, 2020
1 parent 155b98b commit 4edd200
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -9,7 +9,7 @@ All pull requests should be based on the `nightly` branch, to minimize cross mer
### Python Code

#### Compatibility
The code should work with Python 2.7. Note that Tautulli runs on many different platforms.
The code should work with Python 2.7.17 or Python 3.6+. Note that Tautulli runs on many different platforms.

Re-use existing code. Do not hesitate to add logging in your code. You can the logger module `plexpy.logger.*` for this. Web requests are invoked via `plexpy.request.*` and derived ones. Use these methods to automatically add proper and meaningful error handling.

Expand Down Expand Up @@ -38,4 +38,4 @@ HTML5 compatible browsers are targeted.
* 4 space indentation
* `methodName`
* `variableName`
* `ClassName`
* `ClassName`
6 changes: 1 addition & 5 deletions PlexPy.py
@@ -1,8 +1,4 @@
#!/bin/sh
''''which python >/dev/null 2>&1 && exec python "$0" "$@" # '''
''''which python2 >/dev/null 2>&1 && exec python2 "$0" "$@" # '''
''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
''''exec echo "Error: Python not found!" # '''
#!/usr/bin/env python

# -*- coding: utf-8 -*-

Expand Down
8 changes: 4 additions & 4 deletions init-scripts/init.fedora.centos.service
Expand Up @@ -21,16 +21,16 @@ datadir=/opt/Tautulli
configfile=/opt/Tautulli/config.ini
pidfile=/var/run/tautulli.pid
nice=
# The following line must point to your Python 2.7 install
python27=/usr/src/Python-2.7.11/python
# The following line must point to your Python installation
python=/usr/bin/python
##

options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --nolaunch --quiet"

start() {
# Start daemon.
echo -n $"Starting $prog: "
daemon --pidfile=$pidfile $nice $python27 $homedir/Tautulli.py $options
daemon --pidfile=$pidfile $nice $python $homedir/Tautulli.py $options
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch $lockfile
Expand All @@ -39,7 +39,7 @@ start() {

stop() {
echo -n $"Shutting down $prog: "
killproc -p $pidfile $python27
killproc -p $pidfile $python
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f $lockfile
Expand Down
2 changes: 1 addition & 1 deletion init-scripts/init.freebsd
Expand Up @@ -51,7 +51,7 @@ verify_tautulli_pid() {
# Make sure the pid corresponds to the Tautulli process.
if [ -f ${tautulli_pid} ]; then
pid=`cat ${tautulli_pid} 2>/dev/null`
ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
return $?
else
return 0
Expand Down
2 changes: 1 addition & 1 deletion init-scripts/init.freenas
Expand Up @@ -51,7 +51,7 @@ verify_tautulli_pid() {
# Make sure the pid corresponds to the Tautulli process.
if [ -f ${tautulli_pid} ]; then
pid=`cat ${tautulli_pid} 2>/dev/null`
ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
return $?
else
return 0
Expand Down

0 comments on commit 4edd200

Please sign in to comment.