Skip to content

Commit 6dbea43

Browse files
josegonzalezjosegonzalez
committed
Fixed order of beaver_config and file_config in args
1 parent be00d65 commit 6dbea43

7 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎beaver/rabbitmq_transport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
class RabbitmqTransport(beaver.transport.Transport):
99

10-
def __init__(self, file_config, beaver_config):
11-
super(RabbitmqTransport, self).__init__(file_config, beaver_config)
10+
def __init__(self, beaver_config, file_config):
11+
super(RabbitmqTransport, self).__init__(beaver_config, file_config)
1212

1313
self.rabbitmq_key = beaver_config.get('rabbitmq_key')
1414
self.rabbitmq_exchange = beaver_config.get('rabbitmq_exchange')

‎beaver/redis_transport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
class RedisTransport(beaver.transport.Transport):
1010

11-
def __init__(self, file_config, beaver_config):
12-
super(RedisTransport, self).__init__(file_config, beaver_config)
11+
def __init__(self, beaver_config, file_config):
12+
super(RedisTransport, self).__init__(beaver_config, file_config)
1313

1414
redis_url = beaver_config.get('redis_url')
1515
_url = urlparse.urlparse(redis_url, scheme="redis")

‎beaver/transport.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class Transport(object):
55

6-
def __init__(self, file_config, beaver_config):
6+
def __init__(self, beaver_config, file_config):
77
self._file_config = file_config
88
self._format = beaver_config.get('format')
99

‎beaver/udp_transport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
class UdpTransport(beaver.transport.Transport):
88

9-
def __init__(self, file_config, beaver_config):
10-
super(UdpTransport, self).__init__(file_config, beaver_config)
9+
def __init__(self, beaver_config, file_config):
10+
super(UdpTransport, self).__init__(beaver_config, file_config)
1111

1212
self.sock = socket.socket(socket.AF_INET, # Internet
1313
socket.SOCK_DGRAM) # UDP

‎beaver/worker.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Worker(object):
2626
>>> l.loop()
2727
"""
2828

29-
def __init__(self, file_config, beaver_config, callback, logger, ssh_tunnel=None, extensions=["log"], tail_lines=0):
29+
def __init__(self, beaver_config, file_config, callback, logger, ssh_tunnel=None, extensions=["log"], tail_lines=0):
3030
"""Arguments:
3131
3232
(FileConfig) @file_config:
@@ -229,45 +229,45 @@ def close(self):
229229
self.files_map.clear()
230230

231231

232-
def create_transport(file_config, beaver_config):
232+
def create_transport(beaver_config, file_config):
233233
if beaver_config.get('transport') == 'rabbitmq':
234234
import beaver.rabbitmq_transport
235-
transport = beaver.rabbitmq_transport.RabbitmqTransport(file_config, beaver_config)
235+
transport = beaver.rabbitmq_transport.RabbitmqTransport(beaver_config, file_config)
236236
elif beaver_config.get('transport') == 'redis':
237237
import beaver.redis_transport
238-
transport = beaver.redis_transport.RedisTransport(file_config, beaver_config)
238+
transport = beaver.redis_transport.RedisTransport(beaver_config, file_config)
239239
elif beaver_config.get('transport') == 'stdout':
240240
import beaver.stdout_transport
241-
transport = beaver.stdout_transport.StdoutTransport(file_config, beaver_config)
241+
transport = beaver.stdout_transport.StdoutTransport(beaver_config, file_config)
242242
elif beaver_config.get('transport') == 'udp':
243243
import beaver.udp_transport
244-
transport = beaver.udp_transport.UdpTransport(file_config, beaver_config)
244+
transport = beaver.udp_transport.UdpTransport(beaver_config, file_config)
245245
elif beaver_config.get('transport') == 'zmq':
246246
import beaver.zmq_transport
247-
transport = beaver.zmq_transport.ZmqTransport(file_config, beaver_config)
247+
transport = beaver.zmq_transport.ZmqTransport(beaver_config, file_config)
248248
else:
249249
raise Exception('Invalid transport {0}'.format(beaver_config.get('transport')))
250250

251251
return transport
252252

253253

254-
def create_ssh_tunnel(file_config, beaver_config):
254+
def create_ssh_tunnel(beaver_config):
255255
if not beaver_config.use_ssh_tunnel():
256256
return None
257257

258258
return BeaverSshTunnel(beaver_config)
259259

260260

261-
def run_worker(file_config, beaver_config, logger, ssh_tunnel=None):
261+
def run_worker(beaver_config, file_config, logger, ssh_tunnel=None):
262262
logger.info("Logging using the {0} transport".format(beaver_config.get('transport')))
263-
transport = create_transport(file_config, beaver_config)
263+
transport = create_transport(beaver_config, file_config)
264264

265265
if REOPEN_FILES:
266266
logger.info("Detected non-linux platform. Files will be reopened for tailing")
267267

268268
try:
269269
logger.info("Starting worker...")
270-
l = Worker(file_config, beaver_config, transport.callback, logger, ssh_tunnel=ssh_tunnel)
270+
l = Worker(beaver_config, file_config, transport.callback, logger, ssh_tunnel=ssh_tunnel)
271271
logger.info("Working...")
272272
l.loop()
273273
except TransportException, e:

‎beaver/zmq_transport.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
class ZmqTransport(beaver.transport.Transport):
88

9-
def __init__(self, file_config, beaver_config):
10-
super(ZmqTransport, self).__init__(file_config, beaver_config)
9+
def __init__(self, beaver_config, file_config):
10+
super(ZmqTransport, self).__init__(beaver_config, file_config)
1111

1212
zeromq_address = beaver_config.get('zeromq_address')
1313
self.zeromq_bind = (beaver_config.get('mode') == "bind")

‎bin/beaver‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ beaver_config.check_for_deprecated_usage()
7676

7777
failure_count = 0
7878

79-
ssh_tunnel = beaver.worker.create_ssh_tunnel(file_config, beaver_config)
79+
ssh_tunnel = beaver.worker.create_ssh_tunnel(beaver_config)
8080
if ssh_tunnel is not None:
8181
logger.info("Proxying transport using through local ssh tunnel")
8282

8383
while 1:
8484
try:
85-
worker = beaver.worker.run_worker(file_config, beaver_config, logger, ssh_tunnel=ssh_tunnel)
85+
worker = beaver.worker.run_worker(beaver_config, file_config, logger, ssh_tunnel=ssh_tunnel)
8686
except beaver.transport.TransportException, e:
8787
failure_count = failure_count + 1
8888
if failure_count > int(beaver_config.get('max_failure')):

0 commit comments

Comments
 (0)