Skip to content

Commit

Permalink
Remove webchat as a built in command.
Browse files Browse the repository at this point in the history
Webchat will now be an extension that can be installed.
the extension is here:
https://github.com/hemna/aprsd-webchat-extension

Install it from git or pypi.
  • Loading branch information
hemna committed Dec 9, 2024
1 parent dde6810 commit 911ea8c
Show file tree
Hide file tree
Showing 61 changed files with 10 additions and 5,070 deletions.
643 changes: 0 additions & 643 deletions aprsd/cmds/webchat.py

This file was deleted.

36 changes: 0 additions & 36 deletions aprsd/conf/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,12 @@
name="watch_list",
title="Watch List settings",
)
webchat_group = cfg.OptGroup(
name="webchat",
title="Settings specific to the webchat command",
)

registry_group = cfg.OptGroup(
name="aprs_registry",
title="APRS Registry settings",
)


aprsd_opts = [
cfg.StrOpt(
"callsign",
Expand Down Expand Up @@ -194,34 +189,6 @@
),
]

webchat_opts = [
cfg.StrOpt(
"web_ip",
default="0.0.0.0",
help="The ip address to listen on",
),
cfg.PortOpt(
"web_port",
default=8001,
help="The port to listen on",
),
cfg.StrOpt(
"latitude",
default=None,
help="Latitude for the GPS Beacon button. If not set, the button will not be enabled.",
),
cfg.StrOpt(
"longitude",
default=None,
help="Longitude for the GPS Beacon button. If not set, the button will not be enabled.",
),
cfg.BoolOpt(
"disable_url_request_logging",
default=False,
help="Disable the logging of url requests in the webchat command.",
),
]

registry_opts = [
cfg.BoolOpt(
"enabled",
Expand Down Expand Up @@ -261,8 +228,6 @@ def register_opts(config):
config.register_opts(enabled_plugins_opts)
config.register_group(watch_list_group)
config.register_opts(watch_list_opts, group=watch_list_group)
config.register_group(webchat_group)
config.register_opts(webchat_opts, group=webchat_group)
config.register_group(registry_group)
config.register_opts(registry_opts, group=registry_group)

Expand All @@ -271,6 +236,5 @@ def list_opts():
return {
"DEFAULT": (aprsd_opts + enabled_plugins_opts),
watch_list_group.name: watch_list_opts,
webchat_group.name: webchat_opts,
registry_group.name: registry_opts,
}
19 changes: 2 additions & 17 deletions aprsd/log/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,10 @@ def setup_logging(loglevel=None, quiet=False):
"aprslib.parsing",
"aprslib.exceptions",
]
webserver_list = [
"werkzeug",
"werkzeug._internal",
"socketio",
"urllib3.connectionpool",
"chardet",
"chardet.charsetgroupprober",
"chardet.eucjpprober",
"chardet.mbcharsetprober",
]


# We don't really want to see the aprslib parsing debug output.
disable_list = imap_list + aprslib_list + webserver_list
disable_list = imap_list + aprslib_list

# remove every other logger's handlers
# and propagate to root logger
Expand All @@ -91,12 +82,6 @@ def setup_logging(loglevel=None, quiet=False):
else:
logging.getLogger(name).propagate = True

if CONF.webchat.disable_url_request_logging:
for name in webserver_list:
logging.getLogger(name).handlers = []
logging.getLogger(name).propagate = True
logging.getLogger(name).setLevel(logging.ERROR)

handlers = [
{
"sink": sys.stdout,
Expand Down
2 changes: 1 addition & 1 deletion aprsd/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def cli(ctx):
def load_commands():
from .cmds import ( # noqa
completion, dev, fetch_stats, healthcheck, list_plugins, listen,
send_message, server, webchat,
send_message, server,
)


Expand Down
Empty file removed aprsd/web/__init__.py
Empty file.
Empty file removed aprsd/web/admin/__init__.py
Empty file.
84 changes: 0 additions & 84 deletions aprsd/web/admin/static/css/index.css

This file was deleted.

4 changes: 0 additions & 4 deletions aprsd/web/admin/static/css/prism.css

This file was deleted.

35 changes: 0 additions & 35 deletions aprsd/web/admin/static/css/tabs.css

This file was deleted.

Binary file removed aprsd/web/admin/static/images/Untitled.png
Binary file not shown.
Binary file removed aprsd/web/admin/static/images/aprs-symbols-16-0.png
Binary file not shown.
Binary file removed aprsd/web/admin/static/images/aprs-symbols-16-1.png
Binary file not shown.
Binary file removed aprsd/web/admin/static/images/aprs-symbols-64-0.png
Binary file not shown.
Binary file removed aprsd/web/admin/static/images/aprs-symbols-64-1.png
Binary file not shown.
Binary file removed aprsd/web/admin/static/images/aprs-symbols-64-2.png
Binary file not shown.
Loading

0 comments on commit 911ea8c

Please sign in to comment.