Use logger names consistent with directory structure
Refreshed name of loggers to make them consistent with the directory structure. Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
parent
b67c0b7dd0
commit
812bba1de1
|
@ -44,7 +44,7 @@ from subiquitycore.ui.table import TableRow, TablePile
|
|||
from subiquitycore.view import BaseView
|
||||
|
||||
|
||||
log = logging.getLogger("console_conf.views.chooser")
|
||||
log = logging.getLogger("console_conf.ui.views.chooser")
|
||||
|
||||
|
||||
class ChooserBaseView(BaseView):
|
||||
|
|
|
@ -24,7 +24,7 @@ from subiquitycore.ui.form import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger("console_conf.views.identity")
|
||||
log = logging.getLogger("console_conf.ui.views.identity")
|
||||
|
||||
sso_help = ("If you do not have an account, visit "
|
||||
"https://login.ubuntu.com to create one.")
|
||||
|
|
|
@ -27,7 +27,7 @@ from subiquitycore.ui.container import ListBox, Pile
|
|||
from subiquitycore.ui.utils import button_pile, Padding
|
||||
from subiquitycore.view import BaseView
|
||||
|
||||
log = logging.getLogger("subiquitycore.views.login")
|
||||
log = logging.getLogger("console_conf.ui.views.login")
|
||||
|
||||
|
||||
class LoginView(BaseView):
|
||||
|
|
|
@ -24,7 +24,7 @@ from subiquitycore.ui.buttons import done_btn
|
|||
from subiquitycore.ui.utils import button_pile, screen
|
||||
from subiquitycore.view import BaseView
|
||||
|
||||
log = logging.getLogger("console_conf.views.welcome")
|
||||
log = logging.getLogger("console_conf.ui.views.welcome")
|
||||
|
||||
|
||||
class WelcomeView(BaseView):
|
||||
|
|
|
@ -19,7 +19,7 @@ from subiquity.client.controller import SubiquityTuiController
|
|||
from subiquity.ui.views import ZdevView
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.client.controller.zdev")
|
||||
log = logging.getLogger("subiquity.client.controllers.zdev")
|
||||
|
||||
|
||||
class ZdevController(SubiquityTuiController):
|
||||
|
|
|
@ -46,7 +46,7 @@ from subiquity.common.types import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger('subiquitycore.common.errorreport')
|
||||
log = logging.getLogger('subiquity.common.errorreport')
|
||||
|
||||
|
||||
@attr.s(eq=False)
|
||||
|
|
|
@ -27,7 +27,7 @@ try:
|
|||
except ImportError:
|
||||
from curtin.util import get_architecture
|
||||
|
||||
log = logging.getLogger('subiquitycore.models.mirror')
|
||||
log = logging.getLogger('subiquity.models.mirror')
|
||||
|
||||
|
||||
DEFAULT = {
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
import logging
|
||||
|
||||
log = logging.getLogger('subiquitycore.models.proxy')
|
||||
log = logging.getLogger('subiquity.models.proxy')
|
||||
|
||||
dropin_template = '''\
|
||||
[Service]
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
import logging
|
||||
|
||||
log = logging.getLogger("subiquitycore.models.ubuntu_advantage")
|
||||
log = logging.getLogger("subiquity.models.ubuntu_advantage")
|
||||
|
||||
|
||||
class UbuntuAdvantageModel:
|
||||
|
|
|
@ -62,7 +62,7 @@ from subiquity.server.controller import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.server.controller.filesystem")
|
||||
log = logging.getLogger("subiquity.server.controllers.filesystem")
|
||||
block_discover_log = logging.getLogger('block-discover')
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ from subiquity.common.types import ShutdownMode
|
|||
from subiquity.server.controller import SubiquityController
|
||||
from subiquity.server.controllers.install import ApplicationState
|
||||
|
||||
log = logging.getLogger("subiquity.controllers.restart")
|
||||
log = logging.getLogger("subiquity.server.controllers.shutdown")
|
||||
|
||||
|
||||
class ShutdownController(SubiquityController):
|
||||
|
|
|
@ -28,7 +28,7 @@ from subiquity.common.types import Bootloader, ZdevInfo
|
|||
from subiquity.server.controller import SubiquityController
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.server.controller.zdev")
|
||||
log = logging.getLogger("subiquity.server.controllers.zdev")
|
||||
|
||||
lszdev_cmd = ['lszdev', '--quiet', '--pairs', '--columns',
|
||||
'id,type,on,exists,pers,auto,failed,names']
|
||||
|
|
|
@ -25,7 +25,7 @@ from subiquitycore.async_helpers import (
|
|||
|
||||
from subiquity.server.types import InstallerChannels
|
||||
|
||||
log = logging.getLogger('subiquity.common.geoip')
|
||||
log = logging.getLogger('subiquity.server.geoip')
|
||||
|
||||
|
||||
class CheckState(enum.IntEnum):
|
||||
|
|
|
@ -52,7 +52,7 @@ from subiquity.common.errorreport import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.error')
|
||||
log = logging.getLogger('subiquity.ui.views.error')
|
||||
|
||||
|
||||
def close_btn(stretchy, label=None):
|
||||
|
|
|
@ -47,7 +47,7 @@ from subiquity.models.filesystem import (
|
|||
humanize_size,
|
||||
)
|
||||
|
||||
log = logging.getLogger('subiquity.ui.raid')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.compound')
|
||||
|
||||
|
||||
LABEL, DEVICE, PART = range(3)
|
||||
|
|
|
@ -31,7 +31,7 @@ from subiquity.common.filesystem import labels
|
|||
from .helpers import summarize_device
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.filesystem.disk_info')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.delete')
|
||||
|
||||
|
||||
class ConfirmDeleteStretchy(Stretchy):
|
||||
|
|
|
@ -24,7 +24,7 @@ from subiquitycore.ui.table import ColSpec, TablePile, TableRow
|
|||
from subiquity.common.filesystem import labels
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.filesystem.disk_info')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.disk_info')
|
||||
|
||||
|
||||
labels_keys = [
|
||||
|
|
|
@ -75,7 +75,7 @@ from .lvm import VolGroupStretchy
|
|||
from .partition import PartitionStretchy, FormatEntireStretchy
|
||||
from .raid import RaidStretchy
|
||||
|
||||
log = logging.getLogger('subiquity.ui.filesystem.filesystem')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.filesystem')
|
||||
|
||||
|
||||
@attr.s
|
||||
|
|
|
@ -52,7 +52,7 @@ from subiquity.ui.views.identity import (
|
|||
setup_password_validation,
|
||||
)
|
||||
|
||||
log = logging.getLogger('subiquity.ui.lvm')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.lvm')
|
||||
|
||||
|
||||
class VGNameEditor(StringEditor, WantsToKnowFormField):
|
||||
|
|
|
@ -54,7 +54,7 @@ from subiquity.ui.mount import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.filesystem.add_partition')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.partition')
|
||||
|
||||
|
||||
DEFAULT_ALIGNMENT = 1 << 20
|
||||
|
|
|
@ -32,7 +32,7 @@ from subiquitycore.ui.utils import (
|
|||
from subiquitycore.view import BaseView
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.ui.views.filesystem.slow")
|
||||
log = logging.getLogger("subiquity.ui.views.filesystem.probing")
|
||||
|
||||
|
||||
class SlowProbing(BaseView):
|
||||
|
|
|
@ -52,7 +52,7 @@ from subiquity.ui.views.filesystem.compound import (
|
|||
MultiDeviceField,
|
||||
)
|
||||
|
||||
log = logging.getLogger('subiquity.ui.raid')
|
||||
log = logging.getLogger('subiquity.ui.views.filesystem.raid')
|
||||
|
||||
|
||||
raidlevel_choices = [
|
||||
|
|
|
@ -58,7 +58,7 @@ from subiquitycore.ui.width import (
|
|||
from subiquity.common.types import PasswordKind
|
||||
from subiquity.ui.views.error import ErrorReportListStretchy
|
||||
|
||||
log = logging.getLogger('subiquity.ui.help')
|
||||
log = logging.getLogger('subiquity.ui.views.help')
|
||||
|
||||
|
||||
def close_btn(app, stretchy):
|
||||
|
|
|
@ -38,7 +38,7 @@ from subiquity.common.resources import resource_path
|
|||
from subiquity.common.types import IdentityData
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.views.identity")
|
||||
log = logging.getLogger("subiquity.ui.views.identity")
|
||||
|
||||
HOSTNAME_MAXLEN = 64
|
||||
HOSTNAME_REGEX = r'[a-z0-9_][a-z0-9_-]*'
|
||||
|
|
|
@ -36,7 +36,7 @@ from subiquitycore.ui.width import widget_width
|
|||
from subiquity.common.types import ApplicationState
|
||||
|
||||
|
||||
log = logging.getLogger("subiquity.views.installprogress")
|
||||
log = logging.getLogger("subiquity.ui.views.installprogress")
|
||||
|
||||
|
||||
class MyLineBox(LineBox):
|
||||
|
|
|
@ -26,7 +26,7 @@ from subiquitycore.ui.form import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.mirror')
|
||||
log = logging.getLogger('subiquity.ui.views.mirror')
|
||||
|
||||
mirror_help = _(
|
||||
"You may provide an archive mirror that will be used instead "
|
||||
|
|
|
@ -26,7 +26,7 @@ from subiquitycore.ui.buttons import forward_btn, other_btn
|
|||
from subiquitycore.ui.utils import rewrap, screen
|
||||
from subiquitycore.view import BaseView
|
||||
|
||||
log = logging.getLogger("subiquity.views.serial")
|
||||
log = logging.getLogger("subiquity.ui.views.serial")
|
||||
|
||||
|
||||
SERIAL_TEXT = """
|
||||
|
|
|
@ -60,7 +60,7 @@ from subiquity.common.types import (
|
|||
)
|
||||
from subiquity.models.filesystem import humanize_size
|
||||
|
||||
log = logging.getLogger("subiquity.views.snaplist")
|
||||
log = logging.getLogger("subiquity.ui.views.snaplist")
|
||||
|
||||
|
||||
class StarRadioButton(RadioButton):
|
||||
|
|
|
@ -57,7 +57,7 @@ from subiquity.ui.views.identity import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger('subiquity.ui.ssh')
|
||||
log = logging.getLogger('subiquity.ui.views.ssh')
|
||||
|
||||
|
||||
SSH_IMPORT_MAXLEN = 256 + 3 # account for lp: or gh:
|
||||
|
|
|
@ -31,7 +31,7 @@ from subiquitycore.view import BaseView
|
|||
|
||||
from subiquity.common.resources import resource_path
|
||||
|
||||
log = logging.getLogger("subiquity.views.welcome")
|
||||
log = logging.getLogger("subiquity.ui.views.welcome")
|
||||
|
||||
|
||||
HELP = _("""
|
||||
|
|
|
@ -47,7 +47,7 @@ from subiquitycore.ui.utils import (
|
|||
)
|
||||
from subiquitycore.view import BaseView
|
||||
|
||||
log = logging.getLogger('subiquity.ui.zdev')
|
||||
log = logging.getLogger('subiquity.ui.views.zdev')
|
||||
|
||||
|
||||
def status(zdevinfo):
|
||||
|
|
|
@ -48,7 +48,7 @@ from subiquitycore.utils import (
|
|||
)
|
||||
|
||||
|
||||
log = logging.getLogger("subiquitycore.controller.network")
|
||||
log = logging.getLogger("subiquitycore.controllers.network")
|
||||
|
||||
|
||||
class SubiquityNetworkEventReceiver(NetworkEventReceiver):
|
||||
|
|
|
@ -30,7 +30,7 @@ from subiquitycore.ui.container import (
|
|||
)
|
||||
from subiquitycore.ui.selector import Selector
|
||||
|
||||
log = logging.getLogger("subiquitycore.ui.input")
|
||||
log = logging.getLogger("subiquitycore.ui.interactive")
|
||||
|
||||
|
||||
class StringEditor(Edit):
|
||||
|
|
|
@ -62,7 +62,7 @@ from .network_configure_wlan_interface import NetworkConfigureWLANStretchy
|
|||
from subiquitycore.view import BaseView
|
||||
|
||||
|
||||
log = logging.getLogger('subiquitycore.views.network')
|
||||
log = logging.getLogger('subiquitycore.ui.views.network')
|
||||
|
||||
|
||||
def _stretchy_shower(cls, *args):
|
||||
|
|
|
@ -44,7 +44,7 @@ from subiquitycore.ui.utils import button_pile
|
|||
from subiquitycore.ui.buttons import done_btn
|
||||
|
||||
log = logging.getLogger(
|
||||
'subiquitycore.network.network_configure_ipv4_interface')
|
||||
'subiquitycore.ui.views.network_configure_manual_interface')
|
||||
|
||||
ip_families = {
|
||||
4: {
|
||||
|
|
|
@ -23,7 +23,7 @@ from subiquitycore.ui.utils import (
|
|||
)
|
||||
|
||||
log = logging.getLogger(
|
||||
'subiquitycore.network.network_configure_wlan_interface')
|
||||
'subiquitycore.ui.views.network_configure_wlan_interface')
|
||||
|
||||
|
||||
class NetworkList(WidgetWrap):
|
||||
|
|
|
@ -16,7 +16,7 @@ from subiquity.ui.views.installprogress import (
|
|||
from system_setup.ui.views.summary import SummaryView
|
||||
|
||||
|
||||
log = logging.getLogger('ubuntu_wsl_oobe.controllers.summary')
|
||||
log = logging.getLogger('system_setup.client.controllers.summary')
|
||||
|
||||
|
||||
class SummaryController(SubiquityTuiController):
|
||||
|
|
|
@ -19,8 +19,7 @@ from subiquity.client.controller import SubiquityTuiController
|
|||
from subiquity.common.types import WSLConfigurationAdvanced
|
||||
from system_setup.ui.views.wslconfadvanced import WSLConfigurationAdvancedView
|
||||
|
||||
log = logging.getLogger(
|
||||
'system_setup.client.controllers.wslconfigurationadvanced')
|
||||
log = logging.getLogger('system_setup.client.controllers.wslconfadvanced')
|
||||
|
||||
|
||||
class WSLConfigurationAdvancedController(SubiquityTuiController):
|
||||
|
|
|
@ -4,7 +4,7 @@ from subiquity.client.controller import SubiquityTuiController
|
|||
from subiquity.common.types import WSLConfigurationBase
|
||||
from system_setup.ui.views.wslconfbase import WSLConfigurationBaseView
|
||||
|
||||
log = logging.getLogger('system_setup.client.controllers.wslconfigurationbase')
|
||||
log = logging.getLogger('system_setup.client.controllers.wslconfbase')
|
||||
|
||||
|
||||
class WSLConfigurationBaseController(SubiquityTuiController):
|
||||
|
|
|
@ -26,7 +26,7 @@ from .wslconfbase import WSLConfigurationBaseModel
|
|||
from .wslconfadvanced import WSLConfigurationAdvancedModel
|
||||
|
||||
|
||||
log = logging.getLogger('system_setup.models.system_server')
|
||||
log = logging.getLogger('system_setup.models.system_setup')
|
||||
|
||||
HOSTS_CONTENT = """\
|
||||
127.0.0.1 localhost
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
import logging
|
||||
import attr
|
||||
|
||||
log = logging.getLogger('system_setup.models.wsl_configuration_advanced')
|
||||
log = logging.getLogger('system_setup.models.wslconfadvanced')
|
||||
|
||||
|
||||
@attr.s
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
import logging
|
||||
import attr
|
||||
|
||||
log = logging.getLogger('system_setup.models.wsl_configuration_base')
|
||||
log = logging.getLogger('system_setup.models.wslconfbase')
|
||||
|
||||
|
||||
@attr.s
|
||||
|
|
|
@ -21,7 +21,7 @@ from subiquitycore.context import with_context
|
|||
from subiquity.common.types import ShutdownMode
|
||||
from subiquity.server.controllers import ShutdownController
|
||||
|
||||
log = logging.getLogger("system_setup.server.controllers.restart")
|
||||
log = logging.getLogger("system_setup.server.controllers.shutdown")
|
||||
|
||||
|
||||
class WSLShutdownMode(enum.Enum):
|
||||
|
|
|
@ -25,8 +25,7 @@ from subiquity.server.controller import SubiquityController
|
|||
from system_setup.common.wsl_conf import default_loader
|
||||
from system_setup.common.wsl_utils import convert_if_bool
|
||||
|
||||
log = logging.getLogger(
|
||||
'system_setup.server.controllers.wsl_configuration_advanced')
|
||||
log = logging.getLogger('system_setup.server.controllers.wslconfadvanced')
|
||||
|
||||
|
||||
class WSLConfigurationAdvancedController(SubiquityController):
|
||||
|
|
|
@ -25,8 +25,7 @@ from subiquity.server.controller import SubiquityController
|
|||
from system_setup.common.wsl_conf import default_loader
|
||||
from system_setup.common.wsl_utils import convert_if_bool
|
||||
|
||||
log = logging.getLogger('system_setup.server' +
|
||||
'.controllers.wsl_configuration_base')
|
||||
log = logging.getLogger('system_setup.server.controllers.wslconfbase')
|
||||
|
||||
|
||||
class WSLConfigurationBaseController(SubiquityController):
|
||||
|
|
|
@ -19,7 +19,7 @@ from subiquity.common.types import ApplicationState
|
|||
from subiquitycore.ui.container import ListBox
|
||||
from urwid import Text
|
||||
|
||||
log = logging.getLogger("ubuntu_wsl_oobe.ui.views.summary")
|
||||
log = logging.getLogger("system_setup.ui.views.summary")
|
||||
|
||||
|
||||
class SummaryView(BaseView):
|
||||
|
|
Loading…
Reference in New Issue