Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android: usage of log level variables instead of integers at various places.

This commit is contained in:
Joachim Fritzsch 2013-07-01 09:15:04 +02:00
parent ecfaf42267
commit 801cf62985
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
android/BOINC/src/edu/berkeley/boinc/client/Monitor.java
View File

@ -220,7 +220,7 @@ public class Monitor extends Service {
success = true;
} catch (IOException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "Starting BOINC client failed with exception: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "IOException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "IOException", e);
}
return success;
}
@ -305,9 +305,7 @@ public class Monitor extends Service {
if(Logging.DEBUG) Log.d(Logging.TAG, "install of " + file + " successfull. executable: " + executable + "/" + isExecutable);
} catch (IOException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "IOException: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "IOException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "IOException: " + e.getMessage());
if(Logging.DEBUG) Log.d(Logging.TAG, "install of " + file + " failed.");
}
@ -353,11 +351,9 @@ public class Monitor extends Service {
return sb.toString();
} catch (IOException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "IOException: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "IOException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "IOException: " + e.getMessage());
} catch (NoSuchAlgorithmException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "NoSuchAlgorithmException: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "NoSuchAlgorithmException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "NoSuchAlgorithmException: " + e.getMessage());
}
return "";
@ -387,11 +383,9 @@ public class Monitor extends Service {
return sb.toString();
} catch (IOException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "IOException: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "IOException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "IOException: " + e.getMessage());
} catch (NoSuchAlgorithmException e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "NoSuchAlgorithmException: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "NoSuchAlgorithmException", e);
if(Logging.ERROR) Log.e(Logging.TAG, "NoSuchAlgorithmException: " + e.getMessage());
}
return "";
@ -414,8 +408,7 @@ public class Monitor extends Service {
sb.append(buf, 0, count);
}
} catch (Exception e) {
if(Logging.DEBUG) Log.d(Logging.TAG, "Exception: " + e.getMessage());
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "Exception", e);
if(Logging.ERROR) Log.e(Logging.TAG, "Exception: " + e.getMessage());
}
//parse output into hashmap
@ -754,10 +747,10 @@ public class Monitor extends Service {
br.close();
}
catch (FileNotFoundException fnfe) {
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "auth file not found",fnfe);
if(Logging.ERROR) Log.e(Logging.TAG, "auth file not found",fnfe);
}
catch (IOException ioe) {
if(edu.berkeley.boinc.utils.Logging.LOGLEVEL <= 4) Log.e(Logging.TAG, "ioexception",ioe);
if(Logging.ERROR) Log.e(Logging.TAG, "ioexception",ioe);
}
String authKey = fileData.toString();