jarno
/
hemppa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash if no data saved, mount gcal stuff in docker

This commit is contained in:
Ville Ranki 2019-12-10 22:09:21 +02:00
parent b48884fd5b
commit b8c9df8a31
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -6,5 +6,6 @@ COPY Pipfile .
RUN pipenv install --skip-lock --system RUN pipenv install --skip-lock --system
COPY bot.py . COPY bot.py .
COPY modules .
CMD [ "python", "-u", "./bot.py" ] CMD [ "python", "-u", "./bot.py" ]

2
bot.py
View File

@ -61,6 +61,8 @@ class Bot:
self.set_account_data(data) self.set_account_data(data)
def load_settings(self, data): def load_settings(self, data):
if not data:
return
if not data.get('module_settings'): if not data.get('module_settings'):
return return
for modulename, moduleobject in self.modules.items(): for modulename, moduleobject in self.modules.items():

3
docker-compose.yml
View File

@ -12,3 +12,6 @@ services:
- MATRIX_PASSWORD - MATRIX_PASSWORD
- MATRIX_SERVER - MATRIX_SERVER
- JOIN_ON_INVITE - JOIN_ON_INVITE
volumes:
- ${PWD}/credentials.json:/bot/credentials.json
- ${PWD}/token.pickle:/bot/token.pickle