details: http://www.bx.psu.edu/hg/galaxy/rev/9678e1225651 changeset: 3636:9678e1225651 user: Nate Coraor nate@bx.psu.edu date: Tue Apr 13 12:11:17 2010 -0400 description: Allow setting the session cookie path for avoiding conflicts with multiple galaxy servers running behind the same hostname not at the server root

diffstat:

lib/galaxy/config.py | 1 + lib/galaxy/web/framework/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r cdd8d520f3c7 -r 9678e1225651 lib/galaxy/config.py --- a/lib/galaxy/config.py Tue Apr 13 11:23:19 2010 -0400 +++ b/lib/galaxy/config.py Tue Apr 13 12:11:17 2010 -0400 @@ -38,6 +38,7 @@ # Where dataset files are stored self.file_path = resolve_path( kwargs.get( "file_path", "database/files" ), self.root ) self.new_file_path = resolve_path( kwargs.get( "new_file_path", "database/tmp" ), self.root ) + self.cookie_path = kwargs.get( "cookie_path", "/" ) # dataset Track files self.track_store_path = kwargs.get( "track_store_path", "${extra_files_path}/tracks") self.tool_path = resolve_path( kwargs.get( "tool_path", "tools" ), self.root ) diff -r cdd8d520f3c7 -r 9678e1225651 lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py Tue Apr 13 11:23:19 2010 -0400 +++ b/lib/galaxy/web/framework/__init__.py Tue Apr 13 12:11:17 2010 -0400 @@ -410,7 +410,7 @@ """ Update the session cookie to match the current session. """ - self.set_cookie( self.security.encode_session_key( self.galaxy_session.session_key ), name=name ) + self.set_cookie( self.security.encode_session_key( self.galaxy_session.session_key ), name=name, path=self.app.config.cookie_path ) def handle_user_login( self, user, webapp ): """ Login a new user (possibly newly created)