mirror of
https://github.com/dkmstr/openuds.git
synced 2025-03-11 00:58:39 +03:00
added dependency "xset" for rpm and fixed exceptions when some programs were not found
This commit is contained in:
parent
721d32c972
commit
d96a639a3d
@ -11,7 +11,7 @@ Release: %{release}
|
||||
Summary: Actor for Universal Desktop Services (UDS) Broker
|
||||
License: BSD3
|
||||
Group: Admin
|
||||
Requires: python3-six python3-requests python3-qt5 libXScrnSaver
|
||||
Requires: python3-six python3-requests python3-qt5 libXScrnSaver xset
|
||||
Vendor: Virtual Cable S.L.U.
|
||||
URL: http://www.udsenterprise.com
|
||||
Provides: udsactor
|
||||
|
@ -41,10 +41,11 @@ import typing
|
||||
|
||||
from .. import types
|
||||
|
||||
|
||||
from udsactor.log import logger
|
||||
from .renamer import rename
|
||||
from . import xss
|
||||
|
||||
|
||||
def _getMacAddr(ifname: str) -> typing.Optional[str]:
|
||||
'''
|
||||
Returns the mac address of an interface
|
||||
@ -137,14 +138,19 @@ def reboot(flags: int = 0):
|
||||
'''
|
||||
Simple reboot using os command
|
||||
'''
|
||||
subprocess.call(['/sbin/shutdown', 'now', '-r'])
|
||||
|
||||
try:
|
||||
subprocess.call(['/sbin/shutdown', 'now', '-r'])
|
||||
except Exception as e:
|
||||
logger.error('Error rebooting: %s', e)
|
||||
|
||||
def loggoff() -> None:
|
||||
'''
|
||||
Right now restarts the machine...
|
||||
'''
|
||||
subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']])
|
||||
try:
|
||||
subprocess.call(['/usr/bin/pkill', '-u', os.environ['USER']])
|
||||
except Exception as e:
|
||||
logger.error('Error killing user processes: %s', e)
|
||||
# subprocess.call(['/sbin/shutdown', 'now', '-r'])
|
||||
# subprocess.call(['/usr/bin/systemctl', 'reboot', '-i'])
|
||||
|
||||
|
@ -33,6 +33,10 @@ import ctypes
|
||||
import ctypes.util
|
||||
import subprocess
|
||||
|
||||
|
||||
from udsactor.log import logger
|
||||
|
||||
|
||||
xlib = None
|
||||
xss = None
|
||||
display = None
|
||||
@ -107,9 +111,12 @@ def _ensureInitialized():
|
||||
def initIdleDuration(atLeastSeconds: int) -> None:
|
||||
_ensureInitialized()
|
||||
if atLeastSeconds:
|
||||
subprocess.call(['/usr/bin/xset', 's', '{}'.format(atLeastSeconds + 30)])
|
||||
# And now reset it
|
||||
subprocess.call(['/usr/bin/xset', 's', 'reset'])
|
||||
try:
|
||||
subprocess.call(['/usr/bin/xset', 's', '{}'.format(atLeastSeconds + 30)])
|
||||
# And now reset it
|
||||
subprocess.call(['/usr/bin/xset', 's', 'reset'])
|
||||
except Exception as e:
|
||||
logger.error('Error setting screensaver time: %s', e)
|
||||
|
||||
|
||||
def getIdleDuration() -> float:
|
||||
|
Loading…
x
Reference in New Issue
Block a user