Permalink
Browse files

[#943] fix autotest connection refused - carefull not to reintroduce …

…#1222 - implemented proposed fix by Matthias Kurz http://play.lighthouseapp.com/projects/57987/tickets/1222#ticket-1222-10
  • Loading branch information...
1 parent 677aee4 commit 7e493772702a2234acbd7bb3034b1e0eddcca5df @Notalifeform Notalifeform committed Mar 31, 2013
Showing with 5 additions and 2 deletions.
  1. +1 −1 framework/pym/play/commands/base.py
  2. +4 −1 framework/src/play/server/Server.java
@@ -250,7 +250,7 @@ def autotest(app, args):
line = soutint.readline().strip()
if line:
print line
- if line.find('Go to ') > -1: # This line is written out by the test runner to system.out and is not log file dependent
+ if line.find('Server is up and running') > -1: # This line is written out by Server.java to system.out and is not log file dependent
soutint.close()
break
@@ -130,7 +130,10 @@ public Server(String[] args) {
Logger.error("Could not bind on port " + httpsPort, e);
Play.fatalServerErrorOccurred();
}
-
+ if (Play.mode == Mode.DEV) {
+ // print this line to STDOUT - not using logger, so auto test runner will not block if logger is misconfigured (see #1222)
+ System.out.println("~ Server is up and running");
+ }
}
private String getOpt(String[] args, String arg, String defaultValue) {

0 comments on commit 7e49377

Please sign in to comment.