Skip to content

Commit

Permalink
Revert "Enh: Use new/better package path for daemons xxxLink class"
Browse files Browse the repository at this point in the history
This reverts commit 04ce007.

So that this Livestatus can still be used with previous Shinken version.
Grégory Starck committed Feb 13, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 8ee6d26 commit c4e763a
Showing 2 changed files with 13 additions and 10 deletions.
15 changes: 9 additions & 6 deletions module/mapping.py
Original file line number Diff line number Diff line change
@@ -39,13 +39,16 @@
from shinken.objects.config import Config
from shinken.downtime import Downtime
from shinken.comment import Comment
from shinken.objects.schedulerlink import SchedulerLink
from shinken.objects.reactionnerlink import ReactionnerLink
from shinken.objects.brokerlink import BrokerLink
from shinken.objects.receiverlink import ReceiverLink
from shinken.objects.pollerlink import PollerLink
from shinken.log import logger

# TODO : in some later version, change those import to new package path of these XxxLink classes:
# from shinken.objects.schedulerlink import SchedulerLink
from shinken.schedulerlink import SchedulerLink
from shinken.reactionnerlink import ReactionnerLink
from shinken.brokerlink import BrokerLink
from shinken.receiverlink import ReceiverLink
from shinken.pollerlink import PollerLink

from shinken.log import logger
from log_line import LOGCLASS_INFO, LOGCLASS_ALERT, LOGCLASS_PROGRAM, LOGCLASS_NOTIFICATION, LOGCLASS_PASSIVECHECK, LOGCLASS_COMMAND, LOGCLASS_STATE, LOGCLASS_INVALID, LOGCLASS_ALL, LOGOBJECT_INFO, LOGOBJECT_HOST, LOGOBJECT_SERVICE, LOGOBJECT_CONTACT, Logline, LoglineWrongFormat
from shinken.misc.common import DICT_MODATTR

8 changes: 4 additions & 4 deletions test/test_livestatus.py
Original file line number Diff line number Diff line change
@@ -38,10 +38,10 @@
from shinken.objects.timeperiod import Timeperiod
from shinken.comment import Comment
from shinken.util import from_bool_to_int
from shinken.objects.schedulerlink import SchedulerLink
from shinken.objects.reactionnerlink import ReactionnerLink
from shinken.objects.pollerlink import PollerLink
from shinken.objects.brokerlink import BrokerLink
from shinken.schedulerlink import SchedulerLink
from shinken.reactionnerlink import ReactionnerLink
from shinken.pollerlink import PollerLink
from shinken.brokerlink import BrokerLink

from shinken_modules import TestConfig

1 comment on commit c4e763a

@naparuba
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I push to shinken.io :)

Please sign in to comment.