Renamed Service into ServiceIn

diff --git a/bin/inputs/outpeer.py b/bin/inputs/outpeer.py
index eb3779dcad88f5b802f4b458bcd247f19865cffb..138ab4925d8c024c1eb7b95385207b0f43913e0f 100644 (file)
--- a/bin/inputs/outpeer.py
+++ b/bin/inputs/outpeer.py
@@ -11,7 +11,7 @@ from threading import Thread, Lock
 
 from ais.ntools import formataddr
 
-__all__ = [ 'OutPeers', 'outpeers_from_config', 'TcpInOutPeer', 'TcpInOutPeerListen', 'tcpin_outpeers' ]
+__all__ = [ 'OutPeers', 'outpeers_from_config', 'TcpInOutPeer', 'TcpInServiceOut', 'tcpin_outpeers' ]
 
 class UdpOutPeer:
     '''
@@ -125,7 +125,7 @@ class TcpInOutPeer:
 
 
 
-class TcpInOutPeerListen(Thread):
+class TcpInServiceOut(Thread):
     def __init__(self, port):
         Thread.__init__(self)
         self.port = port

diff --git a/bin/inputs/run.py b/bin/inputs/run.py
index bdb208b468541e31befc0750a48bd61061b35847..54ee7e825734b704e9c752dbd571a93f7bdebc5e 100644 (file)
--- a/bin/inputs/run.py
+++ b/bin/inputs/run.py
@@ -15,11 +15,11 @@ from time import time as get_timestamp
 from ais.inputs.config import peers_get_config
 from ais.inputs.stats import STATS_RATE
 from ais.inputs.common import refresh_all_stats, Source
-from ais.inputs.udp import UdpService
-from ais.inputs.serialin import SerialService
-from ais.inputs.tcpout import TcpOutService
+from ais.inputs.udp import UdpServiceIn
+from ais.inputs.serialin import SerialServiceIn
+from ais.inputs.tcpout import TcpOutServiceIn
 from ais.gpsdec import AivdmProcessor
-from ais.inputs.outpeer import TcpInOutPeerListen, tcpin_outpeers
+from ais.inputs.outpeer import TcpInServiceOut, tcpin_outpeers
 
 def mainloop(options, args):
     if options.debug:
@@ -53,7 +53,7 @@ def mainloop(options, args):
     #rootlogger.addHandler(loghandler)
     
     if options.tcp_listeners_port:
-        tcpinoutpeerlisten = TcpInOutPeerListen(options.tcp_listeners_port)
+        tcpinoutpeerlisten = TcpInServiceOut(options.tcp_listeners_port)
         tcpinoutpeerlisten.start()
 
     try:
@@ -62,8 +62,8 @@ def mainloop(options, args):
             logging.critical('No source definition. Check your config file.')
             return
 
-        # build a list of services that needs to be launched
-        all_service_desc = set()
+        # build a list of input services that needs to be launched
+        all_servicein_desc = set()
         for id4, settings in config.iteritems():
             if args and id4 not in args:
                 continue
@@ -73,31 +73,31 @@ def mainloop(options, args):
                 continue
             Source(id4) # make sure the source/stats is created
             if configin[0] == 'Udp':
-                service_desc =  ( configin[0], configin[1], configin[2] )
+                servicein_desc =  ( configin[0], configin[1], configin[2] )
             elif configin[0] == 'Serial':
-                service_desc = ( configin[0], id4, configin[1] )
+                servicein_desc = ( configin[0], id4, configin[1] )
             elif configin[0] == 'TcpOut':
-                service_desc = ( configin[0], id4, configin[1], configin[2] ) 
+                servicein_desc = ( configin[0], id4, configin[1], configin[2] ) 
             else:
                 logging.error('Unsupported protocol %s', configin[0])
                 continue
-            all_service_desc.add(service_desc)
+            all_servicein_desc.add(servicein_desc)
 
-        logging.info('all_service_desc=%s', all_service_desc)
+        logging.info('all_servicein_desc=%s', all_servicein_desc)
         
-        all_services = set()
-        for service_desc in all_service_desc:
-            service_class_name = service_desc[0] + 'Service'
+        all_servicein = set()
+        for servicein_desc in all_servicein_desc:
+            service_class_name = servicein_desc[0] + 'ServiceIn'
             service_class = globals()[service_class_name]
             logging.debug('-'*80)
-            logging.debug('Starting %s%s', service_class, service_desc[1:])
-            service = service_class(*service_desc[1:])
-            all_services.add(service)
+            logging.debug('Starting %s%s', service_class, servicein_desc[1:])
+            service = service_class(*servicein_desc[1:])
+            all_servicein.add(service)
         logging.debug('-'*80)
         
         last_stat = get_timestamp()
         while True:
-            active_services = select(all_services, (), (), STATS_RATE)[0]
+            active_services = select(all_servicein, (), (), STATS_RATE)[0]
             logging.debug('active_services: %s', active_services)
             for service in active_services:
                 from_, channel = service.get_activity()

diff --git a/bin/inputs/serialin.py b/bin/inputs/serialin.py
index e6574d24956ab23e73b9a344342a12bccc24ecb6..ab3eaf0e82cd7c26347dab92a993b6e4be1e4b58 100644 (file)
--- a/bin/inputs/serialin.py
+++ b/bin/inputs/serialin.py
@@ -10,7 +10,7 @@ import serial
 import logging
 
 from ais.inputs.common import get_source_by_id4
-from ais.inputs.virtual import Channel, Service
+from ais.inputs.virtual import Channel, ServiceIn
 
 DEFAULT_SPEED = 38400
 
@@ -60,17 +60,17 @@ class SerialChannel(Channel):
         self.data += data
     
         
-class SerialService(Service):
+class SerialServiceIn(ServiceIn):
     '''
     Service that listen to a ttyS device like /dev/ttyUSB0
     '''
     def __init__(self, id4, serialname, speed=DEFAULT_SPEED):
         # TODO: wait for the request device to be available
-        #Service.__init__(self, stdout)
+        #ServiceIn.__init__(self, stdout)
         self.channel = SerialChannel(id4, serialname, speed)
 
     def __repr__(self):
-        return 'SerialService<%s>' % self.channel.name
+        return 'SerialServiceIn<%s>' % self.channel.name
 
     def fileno(self):
         '''

diff --git a/bin/inputs/tcpout.py b/bin/inputs/tcpout.py
index 77004d59159207834587654e180ec1f97153eeb9..a4ada99122a46a419644471113a0806bcbf15418 100644 (file)
--- a/bin/inputs/tcpout.py
+++ b/bin/inputs/tcpout.py
@@ -9,7 +9,7 @@ import logging
 import socket
 
 from ais.inputs.common import DEFAULT_MTU, get_source_by_id4
-from ais.inputs.virtual import Channel, Service
+from ais.inputs.virtual import Channel, ServiceIn
 
 TCP_HEADER_SIZE = 52
 
@@ -54,16 +54,16 @@ class TcpOutChannel(Channel):
         self.data += data
 
 
-class TcpOutService(Service):
+class TcpOutServiceIn(ServiceIn):
     '''
     Service that connects to a TCP server and listen for data there.
     '''
     def __init__(self, id4, hostname, port):
-        #Service.__init__(self, stdout)
+        #ServiceIn.__init__(self, stdout)
         self.channel = TcpOutChannel(id4, hostname, port)
         
     def __repr__(self):
-        return 'TcpOutService<%s,%s>' \
+        return 'TcpOutServiceIn<%s,%s>' \
             % (self.channel.hostname, self.channel.port)
 
     def fileno(self):

diff --git a/bin/inputs/udp.py b/bin/inputs/udp.py
index 5ca1a12884f593e0962c13f239c34db796c3b478..a93ac9dce1b28c7c97a29e0cbd81b6d3d8882b19 100644 (file)
--- a/bin/inputs/udp.py
+++ b/bin/inputs/udp.py
@@ -11,7 +11,7 @@ import socket
 
 from ais.ntools import formataddr
 from ais.inputs.common import DEFAULT_MTU, get_source_by_id4
-from ais.inputs.virtual import Channel, Service
+from ais.inputs.virtual import Channel, ServiceIn
 from ais.inputs.config import source_get_infoin
 
 UDP_HEADER_SIZE = 28
@@ -33,7 +33,7 @@ class UdpChannel(Channel):
         return result
 
 
-class UdpService(Service):
+class UdpServiceIn(ServiceIn):
     '''
     Service that open an UDP socket and listen for AIVDM data on it.
     '''
@@ -42,7 +42,7 @@ class UdpService(Service):
     MAX_SPORT_DISCRIMINATE = 100
 
     def __init__(self, serverhost, serverport):
-        #Service.__init__(self, stdout)
+        #ServiceIn.__init__(self, stdout)
         self.serverport = serverport
         self.sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
         #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560238 :
@@ -76,7 +76,7 @@ class UdpService(Service):
                           ' All information will be discarded.')
 
     def __repr__(self):
-        return 'UdpService<%s>' % self.serverport
+        return 'UdpServiceIn<%s>' % self.serverport
 
     def fileno(self):
         '''

diff --git a/bin/inputs/virtual.py b/bin/inputs/virtual.py
index be257a9b8392375f03ab678e42e4328fbdbbd425..c81bbd8f4ff5291a8416aa08c7736a7c14dc89b2 100644 (file)
--- a/bin/inputs/virtual.py
+++ b/bin/inputs/virtual.py
@@ -12,14 +12,14 @@ from __future__ import division
 import sys
 
 __all__ = [
-    'Service',
+    'ServiceIn',
     ]
 
-class Service:
+class ServiceIn:
     '''
-    A service provides data for processing.
+    A service provides input data for processing.
     This is a pure virtual class, an interface, that need to be subclassed.
-    Example services are TcpOutService, UdpService, and SerialService.
+    Example services are TcpOutServiceIn, UdpServiceIn, and SerialServiceIn.
     '''
     #def __init__(self, stdout):
     #    '''
@@ -30,14 +30,14 @@ class Service:
 
     def fileno(self):
         '''
-        All services must implement such a function.
+        All input services must implement such a function.
         It should return a file descriptor suitable for os.select()
         '''
         raise NotImplemented
 
     def get_activity(self):
         '''
-        All services must implement such a function.
+        All input services must implement such a function.
         It should return a tuple (from_, channel)
         from_ is a low-level id of the source.
         channels contain a "data" buffer with bytes waiting to be processed,