Chaospott/powerpi
43
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[F] local config and timestamp

Browse Source
This commit is contained in:
telegnom 2017-10-02 16:05:06 +02:00
parent 80ba6f408c
commit 680c845a7e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pi/power.py
View File

@ -31,7 +31,10 @@ def trans_http():
# if more than five seconds passed since last event # if more than five seconds passed since last event
if ((queuetime - queuelast) >= 5): if ((queuetime - queuelast) >= 5):
# put payload together # put payload together
payload = {"val": str(queuetime) + ";" + str(queueval)} if serverconf.getboolean('timestamp'):
payload = {"val": str(queuetime) + ";" + str(queueval)}
else:
payload = {"val": str(queueval)}
log.debug('request {}:{}{} => {}'.format(mqttconf['host'], mqttconf['port'], mqttconf['topic'], repr(payload))) log.debug('request {}:{}{} => {}'.format(mqttconf['host'], mqttconf['port'], mqttconf['topic'], repr(payload)))
# send to http server # send to http server
try: try:
@ -62,7 +65,10 @@ def trans_mqtt():
# if more than five seconds passed since last event # if more than five seconds passed since last event
if ((queuetime - queuelast) >= 5): if ((queuetime - queuelast) >= 5):
# put payload together # put payload together
payload = str(queuetime) + ";" + str(queueval) if mqttconf.getboolean('timestamp'):
payload = str(queuetime) + ";" + str(queueval)
else:
payload = str(queueval)
log.debug('mqtt {} => {}'.format(mqttconf['host'], repr(payload))) log.debug('mqtt {} => {}'.format(mqttconf['host'], repr(payload)))
# send to mqtt broker # send to mqtt broker
try: try:
@ -124,8 +130,13 @@ def readgpio():
if __name__ == "__main__": if __name__ == "__main__":
# read config # read config
dirname, filename = os.path.split(os.path.abspath(__file__))
conf = configparser.ConfigParser() conf = configparser.ConfigParser()
conf.read("powerpi.conf") try:
conf.read(os.path.join([dirname, "powerpi.local.conf"]))
except:
conf.read(os.path.join([dirname, "powerpi.conf"]))
log.warning('using global config. Use powerpi.local.conf instead')
conf.sections() conf.sections()
transconf = conf['transport'] transconf = conf['transport']
gpioconf = conf['gpio'] gpioconf = conf['gpio']
@ -135,6 +146,7 @@ if __name__ == "__main__":
# configure logging # configure logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
log.info('Running in path {}'.format(dirname))
if serverconf["url"] == "power.example.com" and mqttconf['host'] == "power.example.com": if serverconf["url"] == "power.example.com" and mqttconf['host'] == "power.example.com":
log.critical('Server/Broker -> url still default value') log.critical('Server/Broker -> url still default value')
exit(1) exit(1)

2
pi/powerpi.conf
View File

@ -15,9 +15,11 @@ basicauth: yes
user: basicUser user: basicUser
password: basicPass password: basicPass
sslself: yes sslself: yes
timestamp: yes
[mqtt] [mqtt]
host: power.example.com host: power.example.com
port: 1883 port: 1883
clientid: changeme clientid: changeme
topic: /foo/bar/power topic: /foo/bar/power
timestamp: yes