rename module
This commit is contained in:
@@ -22,6 +22,11 @@ try:
|
|||||||
INFLUXDB_AVAILABLE = True
|
INFLUXDB_AVAILABLE = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
INFLUXDB_AVAILABLE = False
|
INFLUXDB_AVAILABLE = False
|
||||||
|
InfluxClient = None
|
||||||
|
Point = None
|
||||||
|
WritePrecision = None
|
||||||
|
SYNCHRONOUS = None
|
||||||
|
ASYNCHRONOUS = None
|
||||||
logger.warning("influxdb-client not installed. Install with: pip install influxdb-client")
|
logger.warning("influxdb-client not installed. Install with: pip install influxdb-client")
|
||||||
|
|
||||||
|
|
||||||
@@ -45,28 +50,23 @@ class InfluxDBClient:
|
|||||||
if hasattr(self, '_initialized'):
|
if hasattr(self, '_initialized'):
|
||||||
return
|
return
|
||||||
|
|
||||||
if not INFLUXDB_AVAILABLE:
|
|
||||||
self.logger = logger
|
|
||||||
self.client = None
|
|
||||||
self.write_api = None
|
|
||||||
self._initialized = False
|
|
||||||
self.logger.error("InfluxDB client library not available")
|
|
||||||
return
|
|
||||||
|
|
||||||
self.config = config.influxdb
|
self.config = config.influxdb
|
||||||
self.logger = logger
|
self.logger = logger
|
||||||
|
|
||||||
|
# Инициализируем атрибуты по умолчанию
|
||||||
self.client: Optional[InfluxClient] = None
|
self.client: Optional[InfluxClient] = None
|
||||||
self.write_api = None
|
self.write_api = None
|
||||||
|
|
||||||
# Очередь для пакетной отправки
|
|
||||||
self.message_queue: Queue[Dict[str, Any]] = Queue()
|
self.message_queue: Queue[Dict[str, Any]] = Queue()
|
||||||
self.running = False
|
self.running = False
|
||||||
self.forwarder_thread: Optional[threading.Thread] = None
|
self.forwarder_thread: Optional[threading.Thread] = None
|
||||||
|
|
||||||
# Статистика
|
|
||||||
self.sent_count = 0
|
self.sent_count = 0
|
||||||
self.failed_count = 0
|
self.failed_count = 0
|
||||||
self.retry_count = 0
|
self.retry_count = 0
|
||||||
|
self._initialized = False
|
||||||
|
|
||||||
|
if not INFLUXDB_AVAILABLE:
|
||||||
|
self.logger.error("InfluxDB client library not available")
|
||||||
|
return
|
||||||
|
|
||||||
# Инициализируем клиент
|
# Инициализируем клиент
|
||||||
self._init_client()
|
self._init_client()
|
||||||
@@ -255,7 +255,7 @@ class InfluxDBClient:
|
|||||||
if not self.config.enabled or not self.write_api:
|
if not self.config.enabled or not self.write_api:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.running:
|
if hasattr(self, 'running') and self.running:
|
||||||
self.logger.warning("InfluxDB forwarder is already running")
|
self.logger.warning("InfluxDB forwarder is already running")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ class InfluxDBClient:
|
|||||||
|
|
||||||
def stop(self) -> None:
|
def stop(self) -> None:
|
||||||
"""Остановка forwarder потока."""
|
"""Остановка forwarder потока."""
|
||||||
if not self.running:
|
if not hasattr(self, 'running') or not self.running:
|
||||||
return
|
return
|
||||||
|
|
||||||
self.logger.info("Stopping InfluxDB forwarder...")
|
self.logger.info("Stopping InfluxDB forwarder...")
|
||||||
@@ -301,7 +301,7 @@ class InfluxDBClient:
|
|||||||
return {
|
return {
|
||||||
"enabled": self.config.enabled,
|
"enabled": self.config.enabled,
|
||||||
"initialized": self._initialized and self.client is not None,
|
"initialized": self._initialized and self.client is not None,
|
||||||
"running": self.running,
|
"running": getattr(self, 'running', False),
|
||||||
"sent_count": self.sent_count,
|
"sent_count": self.sent_count,
|
||||||
"failed_count": self.failed_count,
|
"failed_count": self.failed_count,
|
||||||
"queue_size": self.message_queue.qsize(),
|
"queue_size": self.message_queue.qsize(),
|
||||||
@@ -13,7 +13,7 @@ from typing import Optional, Tuple
|
|||||||
from logger import get_logger
|
from logger import get_logger
|
||||||
from config import config
|
from config import config
|
||||||
from storage import get_storage
|
from storage import get_storage
|
||||||
from influxdb_client import get_influxdb_client
|
from influxdb_handler import get_influxdb_client
|
||||||
|
|
||||||
logger = get_logger(__name__)
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user