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.

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

DM-16021-16022-14659 firefly_client now work new lab channel system #31

Merged
merged 2 commits into from
Nov 1, 2018
Merged

DM-16021-16022-14659 firefly_client now work new lab channel system #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395611c
DM-16021-16022-14659 firefly_client now work new lab channel system
robyww Oct 19, 2018
35a8e83
DM-16021-16022-14659: removed debug statement
robyww Nov 1, 2018
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
9 changes: 7 additions & 2 deletions firefly_client/firefly_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

_my_localurl = 'http://localhost:8080/firefly'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually something that should be in the released code? I think it would be better for the fallback default to be an exception or other error. The likelihood in the open-source context that someone other than one of our devs would be running locally on the 8080 port seems really very low, and the error message from the localhost:8080 fallback seems like it is inevitably going to be less understandable to a user -- something like "can't reach Firefly server at localhost:8080" than an explicit "No Firefly server address could be determined for the user's environment." or equivalent. The latter message is also going to be easier for us to put in context when someone posts it on c.l.o or on Slack.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A one time we were planning more local installs so thIs made sense.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can change it in a future PR.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps what we need for that scenario (which I still find interesting, but not specifically in the LSST context) is a little startup-script wrapper for the standalone environment that sets the FIREFLY_URL environment variable before launching the server?

Or something even smarter, once we take a look at David's issues with the conflict between inside-Docker and outside-Docker local URLs...?


if 'FIREFLY_URL' in os.environ:
if 'fireflyLabExtension' in os.environ:
_my_url = os.environ['fireflyURLLab']
elif 'FIREFLY_URL' in os.environ:
_my_url = os.environ['FIREFLY_URL']
else:
_my_url = _my_localurl
Expand Down Expand Up @@ -118,7 +120,10 @@ def __init__(self, url=_my_url, channel=None, html_file=_my_html_file):

# auto-generate unique channel if not provided
if channel is None:
channel = str(uuid.uuid1())
if 'fireflyLabExtension' in os.environ:
channel = os.environ['fireflyChannelLab']
else:
channel = str(uuid.uuid1())

# websocket url
ws_url = '%s://%s/sticky/firefly/events' % (wsproto, location) # web socket url
Expand Down