Skip to content

Commit e2d940f

Browse files
committed
Fix generating on restart
1 parent cfd1eae commit e2d940f

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

intelmq/bots/outputs/misp/output_feed.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ def init(self):
111111
self._tagging_objects[key].append(tag)
112112
self.logger.debug("Generated tags: %r.", self._tagging_objects)
113113

114+
if self.current_events and self.cache_length():
115+
# Ensure we do generate feed on reload / restart
116+
self._generate_feed()
117+
114118
def _load_event(self, file_path: Path, key: str):
115119
if file_path.exists():
116120
self.current_events[key] = MISPEvent()

intelmq/lib/mixins/cache.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
class CacheMixin:
1616
"""Provides caching possibilities for bots
1717
18-
For key-value cache, use methods:
19-
cache_exists
20-
cache_get
21-
cache_set
22-
23-
To store dict elements in a cache queue named after bot id, use methods:
24-
cache_put
25-
cache_pop
18+
For key-value cache, use methods:
19+
cache_exists
20+
cache_get
21+
cache_set
22+
23+
To store dict elements in a cache queue named after bot id, use methods:
24+
cache_put
25+
cache_pop
26+
cache_length
2627
"""
28+
2729
__redis: redis.Redis = None
2830
redis_cache_host: str = "127.0.0.1"
2931
redis_cache_port: int = 6379
@@ -70,6 +72,9 @@ def cache_put(self, value: dict) -> int:
7072
size = self.__redis.lpush(self.bot_id, json.dumps(value))
7173
return size
7274

75+
def cache_length(self) -> int:
76+
return self.__redis.llen(self.bot_id)
77+
7378
def cache_pop(self) -> dict:
7479
data = self.__redis.rpop(self.bot_id)
7580
if data is None:

0 commit comments

Comments
 (0)