Skip to content

remove double run and moved unnecessary in loop declaration #68

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.

Sign up for GitHub

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

Merged
giancastro merged 4 commits into from
Apr 28, 2021
Merged

remove double run and moved unnecessary in loop declaration #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acf2976
remove double run and moved unnecessary in loop declaration
IuryPiva Apr 11, 2021
24cdbfb
Merge branch 'master' into iurypiva/55-double-running-flask
IuryPiva Apr 22, 2021
d3be1a7
only run debug when called as argument
IuryPiva Apr 22, 2021
e04d45b
Merge branch 'iurypiva/55-double-running-flask' of github.com:makepat…
IuryPiva Apr 22, 2021
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
10 changes: 5 additions & 5 deletions mapshader/flask_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ def service_page(service: MapService):
padding: 10px;
}
</style>

</head>
<body>
{{ psutils_html }}
Expand Down Expand Up @@ -223,7 +222,6 @@ def configure_app(app: Flask, user_source_filepath=None, contains=None):

services = []
for service in get_services(config_path=user_source_filepath, contains=contains):

services.append(service)

view_func = view_func_creators[service.service_type]
Expand All @@ -232,7 +230,6 @@ def configure_app(app: Flask, user_source_filepath=None, contains=None):
app.add_url_rule(service.service_url,
service.name,
partial(view_func, source=service.source))

# add legend endpoint
app.add_url_rule(service.legend_url,
service.legend_name,
Expand All @@ -247,6 +244,7 @@ def configure_app(app: Flask, user_source_filepath=None, contains=None):
app.add_url_rule('/psutil', 'psutil', psutil_fetching)

hello(services)

return app


Expand All @@ -262,10 +260,12 @@ def create_app(user_source_filepath=None, contains=None):
parser = ArgumentParser()
parser.add_argument('-f')
parser.add_argument('-k')
parser.add_argument('--debug', action='store_true')
parsed = parser.parse_args()
user_file = parsed.f
service_grep = parsed.k
debug = parsed.debug
if user_file:
user_file = path.abspath(path.expanduser(user_file))
app = create_app(user_file, contains=service_grep).run(host='0.0.0.0', debug=True)
app.run()

app = create_app(user_file, contains=service_grep).run(host='0.0.0.0', debug=debug)
6 changes: 3 additions & 3 deletions mapshader/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,15 +631,15 @@ def parse_sources(source_objs, config_path=None, contains=None):
}

for source in source_objs:
# create sources
source_obj = MapSource.from_obj(source)

for service_type in source['service_types']:
source['config_path'] = config_path

if contains and contains not in source.get('key'):
continue

# create sources
source_obj = MapSource.from_obj(source)

# create services
ServiceKlass = service_classes[service_type]

Expand Down