git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls...
[jalview.git]
/
src
/
jalview
/
ext
/
pymol
/
PymolManager.java
diff --git
a/src/jalview/ext/pymol/PymolManager.java
b/src/jalview/ext/pymol/PymolManager.java
index
26c780d
..
6a014a5
100644
(file)
--- a/
src/jalview/ext/pymol/PymolManager.java
+++ b/
src/jalview/ext/pymol/PymolManager.java
@@
-140,7
+140,7
@@
public class PymolManager
int rc = conn.getResponseCode();
if (rc != HttpURLConnection.HTTP_OK)
{
int rc = conn.getResponseCode();
if (rc != HttpURLConnection.HTTP_OK)
{
- Cache.log.error(
+ Cache.error(
String.format("Error status from %s: %d", rpcUrl, rc));
return result;
}
String.format("Error status from %s: %d", rpcUrl, rc));
return result;
}
@@
-158,7
+158,7
@@
public class PymolManager
} catch (SocketException e)
{
// thrown when 'quit' command is sent to PyMol
} catch (SocketException e)
{
// thrown when 'quit' command is sent to PyMol
- Cache.log.warn(String.format("Request to %s returned %s", rpcUrl,
+ Cache.warn(String.format("Request to %s returned %s", rpcUrl,
e.toString()));
} catch (Exception e)
{
e.toString()));
} catch (Exception e)
{
@@
-169,6
+169,14
@@
public class PymolManager
{
out.close();
}
{
out.close();
}
+ if (Cache.isTraceEnabled())
+ {
+ Cache.trace("Sent: " + command.toString());
+ if (result != null)
+ {
+ Cache.trace("Received: " + result);
+ }
+ }
}
return result;
}
}
return result;
}
@@
-243,12
+251,12
@@
public class PymolManager
this.pymolXmlRpcPort = getPortNumber();
if (pymolXmlRpcPort > 0)
{
this.pymolXmlRpcPort = getPortNumber();
if (pymolXmlRpcPort > 0)
{
- Cache.log.info("PyMOL XMLRPC started on port " + pymolXmlRpcPort);
+ Cache.info("PyMOL XMLRPC started on port " + pymolXmlRpcPort);
}
else
{
error += "Failed to read PyMOL XMLRPC port number";
}
else
{
error += "Failed to read PyMOL XMLRPC port number";
- Cache.log.error(error);
+ Cache.error(error);
pymolProcess.destroy();
pymolProcess = null;
}
pymolProcess.destroy();
pymolProcess = null;
}
@@
-292,7
+300,7
@@
public class PymolManager
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- Cache.log.error("Failed to get REST port number from " + responses
+ Cache.error("Failed to get REST port number from " + responses
+ ": " + e.getMessage());
// logger.error("Failed to get REST port number from " + responses + ": "
// + e.getMessage());
+ ": " + e.getMessage());
// logger.error("Failed to get REST port number from " + responses + ": "
// + e.getMessage());
@@
-307,10
+315,10
@@
public class PymolManager
}
if (port == 0)
{
}
if (port == 0)
{
- Cache.log.error("Failed to start PyMOL with XMLRPC, response was: "
+ Cache.error("Failed to start PyMOL with XMLRPC, response was: "
+ responses);
}
+ responses);
}
- Cache.log.error("PyMOL started with XMLRPC on port " + port);
+ Cache.error("PyMOL started with XMLRPC on port " + port);
return port;
}
return port;
}