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

Jump to bottom

Added shutting down calls to the visualization server #241

Merged
merged 13 commits into from
Jun 18, 2015
Merged

Added shutting down calls to the visualization server #241

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f7474d9
Added shutting down calls to the visualization server
sahilshekhawat Jun 17, 2015
a628c1c
Made stop_server method from private
sahilshekhawat Jun 17, 2015
1c09a99
Added resuming operations print statement when server shutdown is can…
sahilshekhawat Jun 17, 2015
a49c584
Removed import of __future__ print
sahilshekhawat Jun 17, 2015
52a0bca
Fixed python 2/3 compatibility and some minor tweaks to server
sahilshekhawat Jun 17, 2015
8b48732
fixed doc strings for server.stop_server
sahilshekhawat Jun 17, 2015
d2d4940
Fixed response string on server exit
sahilshekhawat Jun 17, 2015
e47906a
Fixed server docstring
sahilshekhawat Jun 17, 2015
4dd240a
Fixed port in use error
sahilshekhawat Jun 17, 2015
f77b84a
Fixed minor syntax error in server.py
sahilshekhawat Jun 17, 2015
5d99580
changed if-else with better return statement in server.py
sahilshekhawat Jun 18, 2015
63756c3
Addressed some minor fixes in pydy-viz server
sahilshekhawat Jun 18, 2015
d2e91cd
Fixed parameters of Server class
sahilshekhawat Jun 18, 2015
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
Prev Previous commit
Next Next commit
Fixed port in use error
  • Loading branch information
@sahilshekhawat
sahilshekhawat committed Jun 17, 2015
commit 4dd240af3ff91a283bc47a6c1d0d50feecfa96a3
33 changes: 28 additions & 5 deletions pydy/viz/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,37 @@ class Server(object):
port : integer
Defines the port on which the server will run.
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't the case if the port is taken.

scene_file : name of the scene_file generated for visualization
Used here to display the url
A Valid PyDy generated scene file in 'directory'.
directory : absolute path of a directory
Absolute path to the directory which contains scene_file with
all other static files.

Example
-------
>>> server = Server(scene_file=_scene_json_file)
>>> server.run_server()

"""
def __init__(self, port=8000, scene_file="Null"):
self.port = port
self.scene_file = scene_file
self.directory = "static/"
def __init__(self, scene_file, directory=None, port=None):
if scene_file
self.scene_file = scene_file

if directory:
Copy link
Contributor

Choose a reason for hiding this comment

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

Comparisons to singletons like None should always be done with is or is not:
if directory is not None

self.directory = directory
else:
self.directory = "static/"

if port:
self.port = port
else:
self.port = 8000

def run_server(self):
Copy link
Member

Choose a reason for hiding this comment

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

What happens if port 8000 is taken?

Copy link
Member Author

Choose a reason for hiding this comment

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

It throws an error. This needs to be fixed.

# Change dir to static first.
os.chdir(self.directory)
# Get a free port
while self._check_port(self.port):
self.port += 1
handler_class = SimpleHTTPRequestHandler
server_class = StoppableHTTPServer
protocol = "HTTP/1.0"
Expand All @@ -92,6 +107,14 @@ def run_server(self):
signal.signal(signal.SIGINT, self._stop_server)
self.httpd.serve()

def _check_port(self, port):
soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = soc.connect_ex(('127.0.0.1', port))
if result == 0:
Copy link
Contributor

Choose a reason for hiding this comment

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

return result == 0

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

return True
else:
return False

def _stop_server(self, signal, frame):
"""
Confirms and stops the visulisation server
Expand Down