Merge pull request #186 from syncany/bugfix/cli-daemon-interaction

Bugfix/cli daemon interaction

syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java

@@ -229,7 +229,9 @@ private void handleCliRequest(CliRequest cliRequest) {
 			handleCliRequestSyncRunning(cliRequest);
 		}
 		else {
+			watchOperation.pause();
 			handleCliRequestNoSyncRunning(cliRequest);
+			watchOperation.resume();
 		}
 	}
 

syncany-lib/src/main/java/org/syncany/operations/watch/WatchOperation.java

@@ -131,14 +131,12 @@ public WatchOperationResult execute() {
 		}
 
 		syncLoop: while (!stopRequested.get()) {
-			while (pauseRequested.get()) {
-				try {
-					Thread.sleep(1000);
-				}
-				catch (InterruptedException e) {
-					logger.log(Level.INFO, "Sleep INTERRUPTED during PAUSE. STOPPING.", e);
-					break syncLoop;
-				}
+			try {
+				waitWhilePaused();
+			}
+			catch (InterruptedException e) {
+				logger.log(Level.INFO, "Sleep INTERRUPTED during PAUSE. STOPPING.", e);
+				break syncLoop;
 			}
 
 			try {
@@ -243,6 +241,7 @@ private void runSync() throws Exception {
 
 			logger.log(Level.INFO, "RUNNING SYNC ...");
 
+
 			try {
 				boolean notifyChanges = false;
 
@@ -298,6 +297,7 @@ private void runSync() throws Exception {
 	public void pushNotificationReceived(String channel, String message) {
 		if (channel.equals(notificationChannel) && !message.equals(notificationInstanceId)) {
 			try {
+				waitWhilePaused();
 				runSync();
 			}
 			catch (Exception e) {
@@ -309,6 +309,7 @@ public void pushNotificationReceived(String channel, String message) {
 	@Override
 	public void watchEventsOccurred() {
 		try {
+			waitWhilePaused();
 			runSync();
 		}
 		catch (Exception e) {
@@ -355,6 +356,12 @@ public boolean isSyncRunning() {
 	public boolean isSyncRequested() {
 		return syncRequested.get();
 	}
+
+	private void waitWhilePaused() throws InterruptedException {
+		while (pauseRequested.get()) {
+			Thread.sleep(1000);
+		}
+	}
 
 	private void scheduleForceKill() {
 		String killTimerName = "KillTim/" + config.getLocalDir().getName();