Merge lp:~dobey/ubuntuone-client/better-noconnect into lp:ubuntuone-client

[dobey]

Move the date check into the connect method.

This reverts the changes to main.py from the previous revision, and moves the date check to the connect() method. The previous change does not actually cause the process to exit and results in any code using the DBus API hanging around waiting for the request to time out, for a very long time. Instead, we just always block connections, and allow the syncdaemon to start normally otherwise, so that ubuntuone-control-panel, u1sdtool, and Nautilus will continue working normally without problems (outside of the intent of never connecting to the server and not synchronizing files).

[lp:~dobey/ubuntuone-client/better-noconnect]

1407. By dobey on 2014-05-22

Need to import datetime here.

1408. By dobey on 2014-05-22

Fix the logic in the date check.

[Facundo Batista (facundo)]

Nice!

review: Approve

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2013-01-22 20:03:12 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2014-05-22 19:23:08 +0000
@@ -38,6 +38,7 @@
 """
 
 import collections
+import datetime
 import logging
 import os
 import uuid
@@ -1247,6 +1248,11 @@
         for login/registration, only already existent credentials will be used.
 
         """
+        # Avoid connecting after June 1.
+        end_date = datetime.date(2014, 6, 1)
+        if datetime.date.today() >= end_date:
+            return
+
         if self.oauth_credentials is not None:
             logger.debug('connect: oauth credentials were given by parameter.')
             ckey = csecret = key = secret = None

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2014-04-10 19:58:12 +0000
+++ ubuntuone/syncdaemon/main.py	2014-05-22 19:23:08 +0000
@@ -31,7 +31,6 @@
 import logging
 import os
 import sys
-import datetime
 
 from dirspec.utils import user_home
 from twisted.internet import defer, reactor, task
@@ -107,58 +106,51 @@
         if not throttling_enabled:
             throttling_enabled = user_config.get_throttling()
 
-        end_date = datetime.date(2014, 6, 1)
-        if datetime.date.today() < end_date:
-            self.logger.info("Starting Ubuntu One client version %s",
-                             clientdefs.VERSION)
-            self.logger.info("Using %r as root dir", self.root_dir)
-            self.logger.info("Using %r as data dir", self.data_dir)
-            self.logger.info("Using %r as shares root dir", self.shares_dir)
-            self.db = tritcask.Tritcask(tritcask_dir)
-            self.vm = volume_manager.VolumeManager(self)
-            self.fs = filesystem_manager.FileSystemManager(
-                data_dir, partials_dir, self.vm, self.db)
-            self.event_q = event_queue.EventQueue(
-                self.fs, ignore_files, monitor_class=monitor_class)
-            self.fs.register_eq(self.event_q)
-
-            # subscribe VM to EQ, to be unsubscribed in shutdown
-            self.event_q.subscribe(self.vm)
-            self.vm.init_root()
-
-            # we don't have the oauth tokens yet, we 'll get them later
-            self.action_q = action_queue.ActionQueue(self.event_q, self,
-                                                     host, port,
-                                                     dns_srv, ssl,
-                                                     disable_ssl_verify,
-                                                     read_limit, write_limit,
-                                                     throttling_enabled)
-            self.hash_q = hash_queue.HashQueue(self.event_q)
-            events_nanny.DownloadFinishedNanny(self.fs, self.event_q,
-                                               self.hash_q)
-
-            # call StateManager after having AQ
-            self.state_manager = StateManager(self, handshake_timeout)
-
-            self.sync = sync.Sync(self)
-            self.lr = local_rescan.LocalRescan(self.vm, self.fs,
-                                               self.event_q, self.action_q)
-
-            self.external = SyncdaemonService(main=self,
-                                              send_events=broadcast_events)
-            self.external.oauth_credentials = oauth_credentials
-            if user_config.get_autoconnect():
-                self.external.connect(autoconnecting=True)
-
-            self.status_listener = None
-            self.start_status_listener()
-
-            self.mark = task.LoopingCall(self.log_mark)
-            self.mark.start(mark_interval)
-        else:
-            if reactor.running:
-                reactor.stop()
-            sys.exit(0)
+        self.logger.info("Starting Ubuntu One client version %s",
+                         clientdefs.VERSION)
+        self.logger.info("Using %r as root dir", self.root_dir)
+        self.logger.info("Using %r as data dir", self.data_dir)
+        self.logger.info("Using %r as shares root dir", self.shares_dir)
+        self.db = tritcask.Tritcask(tritcask_dir)
+        self.vm = volume_manager.VolumeManager(self)
+        self.fs = filesystem_manager.FileSystemManager(
+            data_dir, partials_dir, self.vm, self.db)
+        self.event_q = event_queue.EventQueue(self.fs, ignore_files,
+                monitor_class=monitor_class)
+        self.fs.register_eq(self.event_q)
+
+        # subscribe VM to EQ, to be unsubscribed in shutdown
+        self.event_q.subscribe(self.vm)
+        self.vm.init_root()
+
+        # we don't have the oauth tokens yet, we 'll get them later
+        self.action_q = action_queue.ActionQueue(self.event_q, self,
+                                                 host, port,
+                                                 dns_srv, ssl,
+                                                 disable_ssl_verify,
+                                                 read_limit, write_limit,
+                                                 throttling_enabled)
+        self.hash_q = hash_queue.HashQueue(self.event_q)
+        events_nanny.DownloadFinishedNanny(self.fs, self.event_q, self.hash_q)
+
+        # call StateManager after having AQ
+        self.state_manager = StateManager(self, handshake_timeout)
+
+        self.sync = sync.Sync(self)
+        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
+                                           self.event_q, self.action_q)
+
+        self.external = SyncdaemonService(main=self,
+                                          send_events=broadcast_events)
+        self.external.oauth_credentials = oauth_credentials
+        if user_config.get_autoconnect():
+            self.external.connect(autoconnecting=True)
+
+        self.status_listener = None
+        self.start_status_listener()
+
+        self.mark = task.LoopingCall(self.log_mark)
+        self.mark.start(mark_interval)
 
     def start_status_listener(self):
         """Start the status listener if it is configured to start."""