Commit 818ffdc9 authored by Anael Beutot's avatar Anael Beutot
Browse files

Tag registration to the cc-server.

parent b7c53d53

ccnode/tags.py

+22 −20
Original line number Diff line number Diff line
@@ -246,7 +246,11 @@ class TagDB(object): 
                continue

            self.rpc_register_sub_object(sub_id)



        # TODO register tags

        # register tags on the cc-server

        for tag in self.db['__main__'].itervalues():

            self.rpc_register_tag(tag)



        # TODO register sub tags



    def rpc_register_sub_object(self, sub_id):

        # register object on the cc-server
@@ -263,24 +267,20 @@ class TagDB(object): 
    rpc_object_unregister_cb = rpc_simple_cb(

        'Error while trying to unregister the object %s, %s("%s")')



    #def rpc_register_tag(self,

    def rpc_tag_register_cb(self, call_id, response, error):

        name = self.async_calls.pop(call_id)

        if error is not None:

            logger.error('Error while trying to register tag %s, %s("%s")',

                         name, error['exception'], error['message'])

            return

    def rpc_register_tag(self, tag):

        self.rpc_call(tag.name, self.rpc_tag_register_cb, 'tags_register',

                      tag.name, tag.ttl, tag.value)



        logger.debug('Successfully registered tag %s', name)

    def rpc_unregister_tag(self, tag_name):

        self.rpc_call(tag_name, self.rpc_tag_unregister_cb, 'tags_unregister',

                      tag_name)



    def rpc_tag_unregister_cb(self, call_id, response, error):

        name = self.async_calls.pop(call_id)

        if error is not None:

            logger.error('Error while trying to unregister tag %s, %s("%s")',

                         name, error['exception'], error['message'])

            return

    #: this is a method

    rpc_tag_register_cb = rpc_simple_cb(

        'Error while trying to register tag %s, %s("%s")')



        logger.debug('Successfully unregistered tag %s', name)

    rpc_tag_unregister_cb = rpc_simple_cb(

        'Error while trying to unregister tag %s, %s("%s")')



    def rpc_sub_tag_register_cb(self, call_id, response, error):

        pass
@@ -314,7 +314,8 @@ class TagDB(object): 
            tag.db = self

            tag.sub_id = '__main__'

            tag.start(self.main.evloop)

            # TODO register tag

            # register tag on the cc-server

            self.rpc_register_tag(tag)

        else:

            self.parent.add_tag(tag)

        self.db['__main__'][tag.name] = tag
@@ -325,7 +326,8 @@ class TagDB(object): 
            tag.db = None

            tag.sub_id = None

            tag.stop()

            # TODO unregister tag

            # unregister tag on the cc-server

            self.rpc_unregister_tag(tag_name)

        else:

            self.parent.remove_tag(tag_name)
@@ -353,9 +355,9 @@ class TagDB(object): 
        if self.parent is None:

            self.rpc_register_sub_object(sub_id)

        else:

            # tags will be registered after

            # tags will be added after

            self.parent.add_sub_object(sub_id, tuple())

        # register tags

        # add sub object tags

        for t in tags:

            self.add_sub_tag(sub_id, t)