← Back to branch summary

~nataliabidart/magicicada-server/use-protocol-2.0-from-wheel

« back to all changes in this revision

Viewing changes to magicicada/server/server.py

  • Committer: Magicicada Bot
  • Author(s): Natalia
  • Date: 2018-04-13 12:21:46 UTC
  • mfrom: (84.2.8 use-venv-dependencies)
  • Revision ID: magicicada_bot-20180413122146-0fd05gi5r0boges8
[r=facundo] - Use devel and non-devel dependencies from a virtualenv.
- Clean former usage of revno from versioninfo.
- Provide travis and docker files so tests can be run in Travis using a xenial image.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magicicada/server/server.py
41
41
import twisted.web.error
42
42
 
43
43
import metrics
44
 
import metrics.services
45
44
 
46
45
from twisted.application.service import MultiService, Service
47
46
from twisted.application.internet import TCPServer
60
59
from magicicada.server import auth, content, errors, stats
61
60
from magicicada.server.diskstorage import DiskStorage
62
61
 
63
 
try:
64
 
    from versioninfo import version_info
65
 
except ImportError:
66
 
    version_info = {
67
 
        'branch_nick': 'Unavailable',
68
 
        'revno': 'Unavailable',
69
 
    }
70
 
 
71
62
 
72
63
# this is the minimal cap we support (to avoid hardcoding it in the code)
73
64
MIN_CAP = frozenset(['no-content', 'account-info', 'resumable-uploads',
85
76
    # frozenset(['example2']): dict(srv_record='_https._tcp.fs.server.com')
86
77
}
87
78
 
 
79
FILESYNC_STATUS_MSG = 'filesync server'
 
80
 
88
81
logger = logging.getLogger(__name__)
89
82
 
90
83
 
381
374
        request.RequestHandler.connectionMade(self)
382
375
        self.factory.protocols.append(self)
383
376
        self.log.info('Connection Made')
384
 
        msg = '%d filesync server revision %s.\r\n' % (
385
 
            self.PROTOCOL_VERSION, version_info['revno'])
 
377
        msg = '%d %s.\r\n' % (self.PROTOCOL_VERSION, FILESYNC_STATUS_MSG)
386
378
        self.transport.write(msg)
387
379
        self.ping_loop.start()
388
380
        self.factory.metrics.meter('connection_made', 1)
2685
2677
        self.factory.rpc_dal = self.rpc_dal
2686
2678
        self.metrics.meter('server_start')
2687
2679
        self.metrics.increment('services_active')
2688
 
        metrics.services.revno()
2689
2680
 
2690
2681
        self._reactor_inspector.start()
2691
2682
        # only start the HeartbeatWriter if the interval is > 0