packages/A-Tune-Collector
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
A-Tune-Collector/change-import-behavior.patch
gaoruoshu@huawei.com 0bb8fedb32 feature: enable application configs 
(cherry picked from commit c9558b4276c94f7fc75fccf1d167f14b53ee1342)
2023-08-07 10:43:26 +08:00

356 lines
12 KiB
Diff
Raw Blame History

From c02c86fbd6927a3d1968d5a1e3030058bbb943a3 Mon Sep 17 00:00:00 2001
From: gaoruoshu <gaoruoshu@huawei.com>
Date: Sat, 15 Jul 2023 15:50:06 +0800
Subject: [PATCH 11/11] change import behavior
---
.../plugin/configurator/__init__.py | 47 +++++++++++--------
.../plugin/configurator/affinity/__init__.py | 2 +-
.../plugin/configurator/bios/__init__.py | 2 +-
.../configurator/bootloader/__init__.py | 2 +-
atune_collector/plugin/configurator/common.py | 2 +-
.../configurator/file_config/__init__.py | 2 +-
.../configurator/kernel_config/__init__.py | 2 +-
.../plugin/configurator/mysql/__init__.py | 3 +-
.../plugin/configurator/nginx/__init__.py | 3 +-
.../plugin/configurator/redis/__init__.py | 3 +-
.../plugin/configurator/script/__init__.py | 2 +-
.../plugin/configurator/sysctl/__init__.py | 2 +-
.../plugin/configurator/sysfs/__init__.py | 2 +-
.../plugin/configurator/systemctl/__init__.py | 2 +-
.../plugin/configurator/ulimit/__init__.py | 2 +-
atune_collector/plugin/monitor/__init__.py | 11 ++++-
.../plugin/monitor/memory/__init__.py | 2 +-
.../plugin/monitor/network/__init__.py | 2 +-
.../plugin/monitor/performance/__init__.py | 2 +-
.../plugin/monitor/process/__init__.py | 2 +-
.../plugin/monitor/processor/__init__.py | 2 +-
.../plugin/monitor/storage/__init__.py | 2 +-
.../plugin/monitor/system/__init__.py | 2 +-
atune_collector/plugin/plugin.py | 4 +-
24 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/atune_collector/plugin/configurator/__init__.py b/atune_collector/plugin/configurator/__init__.py
index 31520f1..fd7ea63 100755
--- a/atune_collector/plugin/configurator/__init__.py
+++ b/atune_collector/plugin/configurator/__init__.py
@@ -17,24 +17,33 @@ Init file.
import sys
import os
-sys.path.append(os.path.dirname(__file__))
+from .affinity import *
+from .bios import *
+from .bootloader import *
+from .file_config import *
+from .kernel_config import *
+from .script import *
+from .sysctl import *
+from .sysfs import *
+from .systemctl import *
+from .ulimit import *
+from .mysql import *
+from .redis import *
+from .nginx import *
-__all__ = [
- "exceptions",
- "affinity",
- "bios",
- "bootloader",
- "file_config",
- "kernel_config",
- "script",
- "sysctl",
- "sysfs",
- "systemctl",
- "ulimit",
- "mysql",
- "redis",
- "nginx",
- "common"]
-
-from . import *
+__all__ = ["exceptions",
+ "affinity",
+ "bios",
+ "bootloader",
+ "file_config",
+ "kernel_config",
+ "script",
+ "sysctl",
+ "sysfs",
+ "systemctl",
+ "ulimit",
+ "mysql",
+ "redis",
+ "nginx",
+ "common"]
diff --git a/atune_collector/plugin/configurator/affinity/__init__.py b/atune_collector/plugin/configurator/affinity/__init__.py
index e29377f..1610cc3 100755
--- a/atune_collector/plugin/configurator/affinity/__init__.py
+++ b/atune_collector/plugin/configurator/affinity/__init__.py
@@ -19,6 +19,6 @@ import os
__all__ = ["irq", "task", "processid"]
-from . import *
+from . import irq, task, processid
sys.path.insert(0, os.path.dirname(__file__))
diff --git a/atune_collector/plugin/configurator/bios/__init__.py b/atune_collector/plugin/configurator/bios/__init__.py
index 1e193cf..1f9df24 100755
--- a/atune_collector/plugin/configurator/bios/__init__.py
+++ b/atune_collector/plugin/configurator/bios/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["bios"]
-from . import *
+from . import bios
diff --git a/atune_collector/plugin/configurator/bootloader/__init__.py b/atune_collector/plugin/configurator/bootloader/__init__.py
index 2412c54..d6cf156 100755
--- a/atune_collector/plugin/configurator/bootloader/__init__.py
+++ b/atune_collector/plugin/configurator/bootloader/__init__.py
@@ -20,6 +20,6 @@ import os
__all__ = ["grub2", "cmdline"]
-from . import *
+from . import grub2, cmdline
sys.path.insert(0, os.path.dirname(__file__))
diff --git a/atune_collector/plugin/configurator/common.py b/atune_collector/plugin/configurator/common.py
index 0fbc2f3..4ab459a 100755
--- a/atune_collector/plugin/configurator/common.py
+++ b/atune_collector/plugin/configurator/common.py
@@ -20,7 +20,7 @@ import logging
import json
from functools import wraps
-from exceptions import SetConfigError
+from .exceptions import SetConfigError
LOGGER = logging.getLogger(__name__)
diff --git a/atune_collector/plugin/configurator/file_config/__init__.py b/atune_collector/plugin/configurator/file_config/__init__.py
index 48aeb30..023de44 100755
--- a/atune_collector/plugin/configurator/file_config/__init__.py
+++ b/atune_collector/plugin/configurator/file_config/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["fconfig"]
-from . import *
+from . import fconfig
diff --git a/atune_collector/plugin/configurator/kernel_config/__init__.py b/atune_collector/plugin/configurator/kernel_config/__init__.py
index 5905327..58dd2b0 100755
--- a/atune_collector/plugin/configurator/kernel_config/__init__.py
+++ b/atune_collector/plugin/configurator/kernel_config/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["kconfig"]
-from . import *
+from . import kconfig
diff --git a/atune_collector/plugin/configurator/mysql/__init__.py b/atune_collector/plugin/configurator/mysql/__init__.py
index 52bb8c3..bfdb807 100644
--- a/atune_collector/plugin/configurator/mysql/__init__.py
+++ b/atune_collector/plugin/configurator/mysql/__init__.py
@@ -17,5 +17,4 @@ Init file.
__all__ = ["mysql"]
-from . import *
-
+from . import mysql
diff --git a/atune_collector/plugin/configurator/nginx/__init__.py b/atune_collector/plugin/configurator/nginx/__init__.py
index e28a310..07c82b0 100644
--- a/atune_collector/plugin/configurator/nginx/__init__.py
+++ b/atune_collector/plugin/configurator/nginx/__init__.py
@@ -17,5 +17,4 @@ Init file.
__all__ = ["nginx"]
-from . import *
-
+from . import nginx
diff --git a/atune_collector/plugin/configurator/redis/__init__.py b/atune_collector/plugin/configurator/redis/__init__.py
index d386f1f..7d21825 100644
--- a/atune_collector/plugin/configurator/redis/__init__.py
+++ b/atune_collector/plugin/configurator/redis/__init__.py
@@ -17,5 +17,4 @@ Init file.
__all__ = ["redis"]
-from . import *
-
+from . import redis
diff --git a/atune_collector/plugin/configurator/script/__init__.py b/atune_collector/plugin/configurator/script/__init__.py
index f743a20..ec6aa17 100755
--- a/atune_collector/plugin/configurator/script/__init__.py
+++ b/atune_collector/plugin/configurator/script/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["script"]
-from . import *
+from . import script
diff --git a/atune_collector/plugin/configurator/sysctl/__init__.py b/atune_collector/plugin/configurator/sysctl/__init__.py
index d6b3f61..3d28df7 100755
--- a/atune_collector/plugin/configurator/sysctl/__init__.py
+++ b/atune_collector/plugin/configurator/sysctl/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["sysctl"]
-from . import *
+from . import sysctl
diff --git a/atune_collector/plugin/configurator/sysfs/__init__.py b/atune_collector/plugin/configurator/sysfs/__init__.py
index d220f40..9d5afb6 100755
--- a/atune_collector/plugin/configurator/sysfs/__init__.py
+++ b/atune_collector/plugin/configurator/sysfs/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["sysfs"]
-from . import *
+from . import sysfs
diff --git a/atune_collector/plugin/configurator/systemctl/__init__.py b/atune_collector/plugin/configurator/systemctl/__init__.py
index 94762b6..c51a07f 100755
--- a/atune_collector/plugin/configurator/systemctl/__init__.py
+++ b/atune_collector/plugin/configurator/systemctl/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["systemctl"]
-from . import *
+from . import systemctl
diff --git a/atune_collector/plugin/configurator/ulimit/__init__.py b/atune_collector/plugin/configurator/ulimit/__init__.py
index 2582b7c..c28a601 100755
--- a/atune_collector/plugin/configurator/ulimit/__init__.py
+++ b/atune_collector/plugin/configurator/ulimit/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["ulimit"]
-from . import *
+from . import ulimit
diff --git a/atune_collector/plugin/monitor/__init__.py b/atune_collector/plugin/monitor/__init__.py
index 9292071..948f869 100755
--- a/atune_collector/plugin/monitor/__init__.py
+++ b/atune_collector/plugin/monitor/__init__.py
@@ -15,6 +15,15 @@
Init file.
"""
+from .memory import *
+from .network import *
+from .performance import *
+from .process import *
+from .processor import *
+from .storage import *
+from .system import *
+from . import common
+
__all__ = [
"memory",
"network",
@@ -24,5 +33,3 @@ __all__ = [
"storage",
"common",
"system"]
-
-from . import *
diff --git a/atune_collector/plugin/monitor/memory/__init__.py b/atune_collector/plugin/monitor/memory/__init__.py
index 0a5a356..5002d6e 100755
--- a/atune_collector/plugin/monitor/memory/__init__.py
+++ b/atune_collector/plugin/monitor/memory/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["numainfo", "topo", "bandwidth", "vmstat", "utilstat", "meminfo"]
-from . import *
+from . import numainfo, topo, bandwidth, vmstat, utilstat, meminfo
diff --git a/atune_collector/plugin/monitor/network/__init__.py b/atune_collector/plugin/monitor/network/__init__.py
index 5d40ab8..388611a 100755
--- a/atune_collector/plugin/monitor/network/__init__.py
+++ b/atune_collector/plugin/monitor/network/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["info", "netstat", "netestat", "topo"]
-from . import *
+from . import info, netstat, netestat, topo
diff --git a/atune_collector/plugin/monitor/performance/__init__.py b/atune_collector/plugin/monitor/performance/__init__.py
index 707f911..93fc6c4 100755
--- a/atune_collector/plugin/monitor/performance/__init__.py
+++ b/atune_collector/plugin/monitor/performance/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["stat", "top"]
-from . import *
+from . import stat, top
diff --git a/atune_collector/plugin/monitor/process/__init__.py b/atune_collector/plugin/monitor/process/__init__.py
index 4c4ceb3..5a34c10 100644
--- a/atune_collector/plugin/monitor/process/__init__.py
+++ b/atune_collector/plugin/monitor/process/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["sched"]
-from . import *
\ No newline at end of file
+from . import sched
diff --git a/atune_collector/plugin/monitor/processor/__init__.py b/atune_collector/plugin/monitor/processor/__init__.py
index fc88e1b..f46d8fd 100755
--- a/atune_collector/plugin/monitor/processor/__init__.py
+++ b/atune_collector/plugin/monitor/processor/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["info", "stat", "topo"]
-from . import *
+from . import info, stat, topo
diff --git a/atune_collector/plugin/monitor/storage/__init__.py b/atune_collector/plugin/monitor/storage/__init__.py
index 670294d..9e5e152 100755
--- a/atune_collector/plugin/monitor/storage/__init__.py
+++ b/atune_collector/plugin/monitor/storage/__init__.py
@@ -17,4 +17,4 @@ Init file.
__all__ = ["iostat", "topo"]
-from . import *
+from . import iostat, topo
diff --git a/atune_collector/plugin/monitor/system/__init__.py b/atune_collector/plugin/monitor/system/__init__.py
index 5c6a00c..f66c1ef 100755
--- a/atune_collector/plugin/monitor/system/__init__.py
+++ b/atune_collector/plugin/monitor/system/__init__.py
@@ -17,4 +17,4 @@ The import content of the package.
__all__ = ["bios", "ldavg", "tasks", "filed", "interrupts"]
-from . import *
+from . import bios, ldavg, tasks, filed, interrupts
diff --git a/atune_collector/plugin/plugin.py b/atune_collector/plugin/plugin.py
index b83d3aa..3f84f2f 100755
--- a/atune_collector/plugin/plugin.py
+++ b/atune_collector/plugin/plugin.py
@@ -19,9 +19,9 @@ import logging
import threading
import time
-from configurator.common import Configurator
+from .configurator.common import Configurator
-from monitor.common import Monitor
+from .monitor.common import Monitor
LOGGER = logging.getLogger(__name__)
--
2.27.0
Reference in New Issue View Git Blame Copy Permalink