mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into wip-proxyRequests

Browse source
This commit is contained in:
Robert Resch 2021-04-29 22:53:53 +02:00
commit fdb934980d
No known key found for this signature in database
GPG key ID: 6B360759EB2ACAEE
3 changed files with 70 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

102
bumper/__init__.py
View file

@ -26,10 +26,13 @@ def strtobool(strbool):
# os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG # os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG
bumper_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) bumper_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
log_to_stdout = os.environ.get("LOG_TO_STDOUT")
# Set defaults from environment variables first # Set defaults from environment variables first
# Folders # Folders
logs_dir = os.environ.get("BUMPER_LOGS") or os.path.join(bumper_dir, "logs") if not log_to_stdout:
os.makedirs(logs_dir, exist_ok=True) # Ensure logs directory exists or create logs_dir = os.environ.get("BUMPER_LOGS") or os.path.join(bumper_dir, "logs")
os.makedirs(logs_dir, exist_ok=True) # Ensure logs directory exists or create
data_dir = os.environ.get("BUMPER_DATA") or os.path.join(bumper_dir, "data") data_dir = os.environ.get("BUMPER_DATA") or os.path.join(bumper_dir, "data")
os.makedirs(data_dir, exist_ok=True) # Ensure data directory exists or create os.makedirs(data_dir, exist_ok=True) # Ensure data directory exists or create
certs_dir = os.environ.get("BUMPER_CERTS") or os.path.join(bumper_dir, "certs") certs_dir = os.environ.get("BUMPER_CERTS") or os.path.join(bumper_dir, "certs")
@ -81,27 +84,36 @@ logformat = logging.Formatter(
) )
bumperlog = logging.getLogger("bumper") bumperlog = logging.getLogger("bumper")
bumper_rotate = RotatingFileHandler("logs/bumper.log", maxBytes=5000000, backupCount=5) if not log_to_stdout:
bumper_rotate.setFormatter(logformat) bumper_rotate = RotatingFileHandler("logs/bumper.log", maxBytes=5000000, backupCount=5)
bumperlog.addHandler(bumper_rotate) bumper_rotate.setFormatter(logformat)
bumperlog.addHandler(bumper_rotate)
else:
bumperlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# bumperlog.setLevel(logging.INFO) # bumperlog.setLevel(logging.INFO)
confserverlog = logging.getLogger("confserver") confserverlog = logging.getLogger("confserver")
conf_rotate = RotatingFileHandler( if not log_to_stdout:
"logs/confserver.log", maxBytes=5000000, backupCount=5 conf_rotate = RotatingFileHandler(
) "logs/confserver.log", maxBytes=5000000, backupCount=5
conf_rotate.setFormatter(logformat) )
confserverlog.addHandler(conf_rotate) conf_rotate.setFormatter(logformat)
confserverlog.addHandler(conf_rotate)
else:
confserverlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# confserverlog.setLevel(logging.INFO) # confserverlog.setLevel(logging.INFO)
mqttserverlog = logging.getLogger("mqttserver") mqttserverlog = logging.getLogger("mqttserver")
mqtt_rotate = RotatingFileHandler( if not log_to_stdout:
"logs/mqttserver.log", maxBytes=5000000, backupCount=5 mqtt_rotate = RotatingFileHandler(
) "logs/mqttserver.log", maxBytes=5000000, backupCount=5
mqtt_rotate.setFormatter(logformat) )
mqttserverlog.addHandler(mqtt_rotate) mqtt_rotate.setFormatter(logformat)
mqttserverlog.addHandler(mqtt_rotate)
else:
mqttserverlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# mqttserverlog.setLevel(logging.INFO) # mqttserverlog.setLevel(logging.INFO)
@ -117,47 +129,67 @@ proxymodelog.addHandler(proxymode_rotate)
### Additional MQTT Logs ### Additional MQTT Logs
translog = logging.getLogger("transitions") translog = logging.getLogger("transitions")
translog.addHandler(mqtt_rotate) if not log_to_stdout:
translog.addHandler(mqtt_rotate)
else:
translog.addHandler(logging.StreamHandler(sys.stdout))
translog.setLevel(logging.CRITICAL + 1) # Ignore this logger translog.setLevel(logging.CRITICAL + 1) # Ignore this logger
logging.getLogger("passlib").setLevel(logging.CRITICAL + 1) # Ignore this logger logging.getLogger("passlib").setLevel(logging.CRITICAL + 1) # Ignore this logger
brokerlog = logging.getLogger("hbmqtt.broker") brokerlog = logging.getLogger("hbmqtt.broker")
#brokerlog.setLevel( #brokerlog.setLevel(
# logging.CRITICAL + 1 # logging.CRITICAL + 1
#) # Ignore this logger #There are some sublogs that could be set if needed (.plugins) #) # Ignore this logger #There are some sublogs that could be set if needed (.plugins)
brokerlog.addHandler(mqtt_rotate) if not log_to_stdout:
brokerlog.addHandler(mqtt_rotate)
else:
brokerlog.addHandler(logging.StreamHandler(sys.stdout))
protolog = logging.getLogger("hbmqtt.mqtt.protocol") protolog = logging.getLogger("hbmqtt.mqtt.protocol")
#protolog.setLevel( #protolog.setLevel(
# logging.CRITICAL + 1 # logging.CRITICAL + 1
#) # Ignore this logger #) # Ignore this logger
protolog.addHandler(mqtt_rotate) if not log_to_stdout:
protolog.addHandler(mqtt_rotate)
else:
protolog.addHandler(logging.StreamHandler(sys.stdout))
clientlog = logging.getLogger("hbmqtt.client") clientlog = logging.getLogger("hbmqtt.client")
#clientlog.setLevel(logging.CRITICAL + 1) # Ignore this logger #clientlog.setLevel(logging.CRITICAL + 1) # Ignore this logger
clientlog.addHandler(mqtt_rotate) if not log_to_stdout:
clientlog.addHandler(mqtt_rotate)
else:
clientlog.addHandler(logging.StreamHandler(sys.stdout))
helperbotlog = logging.getLogger("helperbot") helperbotlog = logging.getLogger("helperbot")
helperbot_rotate = RotatingFileHandler( if not log_to_stdout:
"logs/helperbot.log", maxBytes=5000000, backupCount=5 helperbot_rotate = RotatingFileHandler(
) "logs/helperbot.log", maxBytes=5000000, backupCount=5
helperbot_rotate.setFormatter(logformat) )
helperbotlog.addHandler(helperbot_rotate) helperbot_rotate.setFormatter(logformat)
helperbotlog.addHandler(helperbot_rotate)
else:
helperbotlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# helperbotlog.setLevel(logging.INFO) # helperbotlog.setLevel(logging.INFO)
boterrorlog = logging.getLogger("boterror") boterrorlog = logging.getLogger("boterror")
boterrorlog_rotate = RotatingFileHandler( if not log_to_stdout:
"logs/boterror.log", maxBytes=5000000, backupCount=5 boterrorlog_rotate = RotatingFileHandler(
) "logs/boterror.log", maxBytes=5000000, backupCount=5
boterrorlog_rotate.setFormatter(logformat) )
boterrorlog.addHandler(boterrorlog_rotate) boterrorlog_rotate.setFormatter(logformat)
boterrorlog.addHandler(boterrorlog_rotate)
else:
boterrorlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# boterrorlog.setLevel(logging.INFO) # boterrorlog.setLevel(logging.INFO)
xmppserverlog = logging.getLogger("xmppserver") xmppserverlog = logging.getLogger("xmppserver")
xmpp_rotate = RotatingFileHandler( if not log_to_stdout:
"logs/xmppserver.log", maxBytes=5000000, backupCount=5 xmpp_rotate = RotatingFileHandler(
) "logs/xmppserver.log", maxBytes=5000000, backupCount=5
xmpp_rotate.setFormatter(logformat) )
xmppserverlog.addHandler(xmpp_rotate) xmpp_rotate.setFormatter(logformat)
xmppserverlog.addHandler(xmpp_rotate)
else:
xmppserverlog.addHandler(logging.StreamHandler(sys.stdout))
# Override the logging level # Override the logging level
# xmppserverlog.setLevel(logging.INFO) # xmppserverlog.setLevel(logging.INFO)

2
bumper/plugins/bumper_confserver_portal_iot.py
View file

@ -29,7 +29,7 @@ class portal_api_iot(plugins.ConfServerApp):
try: try:
json_body = json.loads(await request.text()) json_body = json.loads(await request.text())
randomid = "".join(random.sample(string.ascii_letters, 6)) randomid = "".join(random.sample(string.ascii_letters, 4))
did = "" did = ""
if "toId" in json_body: # Its a command if "toId" in json_body: # Its a command
did = json_body["toId"] did = json_body["toId"]

3
docs/Env_Var.md
View file

@ -11,4 +11,5 @@ Bumper has a number of environment variables to help with custom deployments and
| BUMPER_KEY | {full path to bumper.key location} | The private server key (bumper.key) to be used by the Bumper server | | BUMPER_KEY | {full path to bumper.key location} | The private server key (bumper.key) to be used by the Bumper server |
| BUMPER_LOGS | {full path to logs directory} | The directory where logs should be stored | | BUMPER_LOGS | {full path to logs directory} | The directory where logs should be stored |
| BUMPER_DATA | {full path to data directory} | The directory where persistent data should be stored (bumper.db) | | BUMPER_DATA | {full path to data directory} | The directory where persistent data should be stored (bumper.db) |
| BUMPER_DEBUG | true | Run Bumper with debug mode/logging | | BUMPER_DEBUG | true | Run Bumper with debug mode/logging |
| LOG_TO_STDOUT | true | Instead of logging to logs/, logs to to STDOUT |