|
|
|
@ -363,26 +363,32 @@ public class MpMasterService extends Service {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String appPath = MicroPhotoContext.buildMpAppDir(context);
|
|
|
|
|
long ts = System.currentTimeMillis();
|
|
|
|
|
final String appPath = MicroPhotoContext.buildMpAppDir(context);
|
|
|
|
|
final long ts = System.currentTimeMillis();
|
|
|
|
|
if (ts - mTimeToStartMpApp < 30000) {
|
|
|
|
|
logger.warning("MpAPP is STILL Running");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
File mpappHb = new File(appPath + "data/alive/hb");
|
|
|
|
|
long modifiedTimeOfHb = getFileModificationTime(appPath + "data/alive/hb");
|
|
|
|
|
long modifiedTimeOfPhoto = getFileModificationTime(appPath + "data/alive/taking");
|
|
|
|
|
long modifiedTimeOfUpload = getFileModificationTime(appPath + "data/alive/upload");
|
|
|
|
|
final File mpappHb = new File(appPath + "data/alive/hb");
|
|
|
|
|
final long modifiedTimeOfHb = getFileModificationTime(appPath + "data/alive/hb");
|
|
|
|
|
final long modifiedTimeOfPhoto = getFileModificationTime(appPath + "data/alive/taking");
|
|
|
|
|
final long modifiedTimeOfUpload = getFileModificationTime(appPath + "data/alive/upload");
|
|
|
|
|
|
|
|
|
|
if (((ts - modifiedTimeOfHb) > mTimeOfMpAppAlive) ||
|
|
|
|
|
((ts - modifiedTimeOfPhoto) > mTimeOfMpAppAlive * 4) ||
|
|
|
|
|
((ts - modifiedTimeOfUpload) > mTimeOfMpAppAlive * 4)) {
|
|
|
|
|
mHander.postDelayed(new Runnable() {
|
|
|
|
|
@Override
|
|
|
|
|
public void run() {
|
|
|
|
|
// greater than 30m
|
|
|
|
|
logger.warning("Restart MpAPP as it is NOT Running hb=" + Long.toString(ts - modifiedTimeOfHb) +
|
|
|
|
|
" taking=" + Long.toString(ts - modifiedTimeOfPhoto) + " sending=" + Long.toString(ts - modifiedTimeOfUpload));
|
|
|
|
|
MicroPhotoContext.restartMpApp(context);
|
|
|
|
|
mTimeToStartMpApp = ts;
|
|
|
|
|
mTimeToStartMpApp = System.currentTimeMillis();
|
|
|
|
|
}
|
|
|
|
|
}, 60000);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception ex) {
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|