Sextant

Merge lp:~ensoft-opensource/ensoft-sextant/minor_bugfixes into lp:ensoft-sextant

  1. minor_bugfixes
  2. Merge into whiteline
Proposed by Patrick Stevens
Status: Merged
Approved by: Patrick Stevens
Approved revision: 5
Merged at revision: 4
Proposed branch: lp:~ensoft-opensource/ensoft-sextant/minor_bugfixes
Merge into: lp:ensoft-sextant
Diff against target: 27 lines (+3/-3)
2 files modified
resources/sextant/web/interface.html (+1/-1)
src/sextant/query.py (+2/-2)
To merge this branch: bzr merge lp:~ensoft-opensource/ensoft-sextant/minor_bugfixes
Reviewer Review Type Date Requested Status
Patrick Stevens Approve
Review via email: mp+231220@code.launchpad.net

Commit message

Change logging.exception to logging.error when we can't connect to the server - makes the output much nicer.

Description of the change

Change logging.exception to logging.error when we can't connect to the server - makes the output much nicer.

To post a comment you must log in.
Revision history for this message
Martin Morrison (isoschiz) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

Revision history for this message
Patrick Stevens (patrickas) wrote :

Assuming this is good, because it's a two-line change.

review: Approve
Revision history for this message
Patrick Stevens (patrickas) :
review: Approve
lp:~ensoft-opensource/ensoft-sextant/minor_bugfixes updated
4. By James Harkin <email address hidden>

change title of web interface

5. By James Harkin <email address hidden>

nerge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'resources/sextant/web/interface.html'
--- resources/sextant/web/interface.html 2014-08-14 15:23:39 +0000
+++ resources/sextant/web/interface.html 2014-08-19 09:45:58 +0000
@@ -10,7 +10,7 @@
10<head>10<head>
11<meta charset="utf-8"/>11<meta charset="utf-8"/>
12 <link rel="stylesheet" type="text/css" href="style_sheet.css"/>12 <link rel="stylesheet" type="text/css" href="style_sheet.css"/>
13 <title> Webinterface test </title>13 <title> Sextant Query </title>
14</head>14</head>
1515
16<body onload="get_names_for_autocomplete('programs')">16<body onload="get_names_for_autocomplete('programs')">
1717
=== modified file 'src/sextant/query.py'
--- src/sextant/query.py 2014-08-11 15:14:05 +0000
+++ src/sextant/query.py 2014-08-19 09:45:58 +0000
@@ -18,8 +18,8 @@
18 try:18 try:
19 db = db_api.SextantConnection(remote_neo4j)19 db = db_api.SextantConnection(remote_neo4j)
20 except requests.exceptions.ConnectionError as err:20 except requests.exceptions.ConnectionError as err:
21 logging.exception("Could not connect to Neo4J server {}. Are you sure it is running?".format(remote_neo4j))21 logging.error("Could not connect to Neo4J server {}. Are you sure it is running?".format(remote_neo4j))
22 logging.exception(str(err))22 logging.error(str(err))
23 return 223 return 2
24 #Not supported in python 224 #Not supported in python 2
25 #except (urllib.exceptions.MaxRetryError):25 #except (urllib.exceptions.MaxRetryError):

Subscribers

People subscribed via source and target branches