Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old NMA Files #374

Merged
merged 5 commits into from
Sep 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
##### Changed
##### Deprecated
##### Removed
- Notify-my-Andoird Plugin und Logging-Handler wegen Einstellung des Service entfernt [#374](https://github.com/Schrolli91/BOSWatch/pull/374)
##### Fixed
##### Security

Expand Down
23 changes: 0 additions & 23 deletions boswatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,29 +249,6 @@
logging.debug("cannot set loglevel of fileHandler", exc_info=True)


#
# Add NMA logging handler
#
try:
if configHandler.checkConfig("NMAHandler"):
# is NMAHandler enabled?
if globalVars.config.getboolean("NMAHandler", "enableHandler") == True:
# we only could do something, if an APIKey is given:
if len(globalVars.config.get("NMAHandler","APIKey")) > 0:
logging.debug("add NMA logging handler")
from includes import NMAHandler
if globalVars.config.get("NMAHandler","appName") == "":
nmaHandler = NMAHandler.NMAHandler(globalVars.config.get("NMAHandler","APIKey"))
else:
nmaHandler = NMAHandler.NMAHandler(globalVars.config.get("NMAHandler","APIKey"), globalVars.config.get("NMAHandler","appName"))
nmaHandler.setLevel(globalVars.config.getint("NMAHandler","loglevel"))
myLogger.addHandler(nmaHandler)
except:
# It's an error, but we could work without that stuff...
logging.error("cannot add NMA logging handler")
logging.debug("cannot add NMA logging handler", exc_info=True)


# initialization was fine, continue with main program...

#
Expand Down
34 changes: 0 additions & 34 deletions config/config.template.ini
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,6 @@ doubleFilter_check_msg = 0
writeMultimonRaw = 0


[NMAHandler]
# you can use a logging handler for sending logging records to NotifyMyAndroid
# enableHandler (0|1) will enable the NMA handler
enableHandler = 0

# loglevel for NMAHandler (see BOSWatch loglevel description)
loglevel = 50

# logging record will send to APIKey
APIKey =

# you can change the name of the application (default: BOSWatch)
# (f.e. if you use more than one instance of BOSWatch)
appName = BOSWatch


[FMS]
# look-up-table for adding a description
# using description (0 - off | 1 - on)
Expand Down Expand Up @@ -177,7 +161,6 @@ eMail = 0
BosMon = 0
firEmergency = 0
jsonSocket = 0
notifyMyAndroid = 0
SMS = 0
Sms77 = 0
FFAgent = 0
Expand Down Expand Up @@ -287,23 +270,6 @@ server = 192.168.0.1
port = 8888


[notifyMyAndroid]
# APIKey given from notifyMyAndroid
APIKey =

# Priority goes from -2 (lowest) to 2 (highest). The default priority is 0 (normal)
priority = 0

# You can change the name of the application (default: BOSWatch)
# (f.e. if you use more than one instance of BOSWatch)
appName = BOSWatch

# instead of a given APIKey/priority you could import them by a csv-file (0|1)
# APIKey and priority above will be ignored, if you use a csv
# configuration loaded from csv/nma.csv
usecsv = 0


[SMS]
# be aware that you need 'gammu' installed and running
# at least you need an UMTS-stick which is supported by 'gammu'
Expand Down
73 changes: 0 additions & 73 deletions includes/NMAHandler.py

This file was deleted.

137 changes: 0 additions & 137 deletions includes/pynma/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions includes/pynma/__init__.py

This file was deleted.

Loading