Skip to content

Commit 0e64113

Browse files
committed
allow uninstalled startup for IDE-debugging; handle UnknownSystemEntity exception
1 parent 6811e23 commit 0e64113

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/satosa/proxy_server.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from .context import Context
1212
from .response import ServiceError, NotFound
1313
from .routing import SATOSANoBoundEndpointError
14+
from saml2.s_utils import UnknownSystemEntity
1415

1516
logger = logging.getLogger(__name__)
1617

@@ -117,7 +118,8 @@ def __call__(self, environ, start_response, debug=False):
117118
resp = NotFound("Couldn't find the page you asked for!")
118119
return resp(environ, start_response)
119120
except Exception as err:
120-
logger.exception("%s" % err)
121+
if type(err) != UnknownSystemEntity:
122+
logger.exception("%s" % err)
121123
if debug:
122124
raise
123125

@@ -137,7 +139,12 @@ def make_app(satosa_config):
137139
root_logger.addHandler(stderr_handler)
138140
root_logger.setLevel(logging.DEBUG)
139141

140-
logger.info("Running SATOSA version %s", pkg_resources.get_distribution("SATOSA").version)
142+
try:
143+
pkg = pkg_resources.get_distribution(module.__name__)
144+
logger.info("Running SATOSA version %s",
145+
pkg_resources.get_distribution("SATOSA").version)
146+
except (NameError, pkg_resources.DistributionNotFound):
147+
pass
141148
return ToBytesMiddleware(WsgiApplication(satosa_config))
142149
except Exception:
143150
logger.exception("Failed to create WSGI app.")

0 commit comments

Comments
 (0)