Fix typos, add some missed args and ensure consistency on where logger is defined.
Bug: None
Test: acloud-dev create --local-image
acloud-dev create --local-image --local-instance
Change-Id: I272cd82d68139e7d6ac27b84fdf725ce9818df3d
diff --git a/public/acloud_kernel/acloud_kernel.py b/public/acloud_kernel/acloud_kernel.py
index 5fd51b8..e4bb22f 100755
--- a/public/acloud_kernel/acloud_kernel.py
+++ b/public/acloud_kernel/acloud_kernel.py
@@ -24,6 +24,7 @@
from acloud.public import config
from acloud.public.acloud_kernel import kernel_swapper
+
DEFAULT_CONFIG_FILE = "acloud.config"
# Commands
diff --git a/public/acloud_kernel/kernel_swapper.py b/public/acloud_kernel/kernel_swapper.py
index 1e6abe3..c25f3ab 100755
--- a/public/acloud_kernel/kernel_swapper.py
+++ b/public/acloud_kernel/kernel_swapper.py
@@ -25,6 +25,7 @@
from acloud.internal.lib import auth
from acloud.internal.lib import utils
+
# ssh flags used to communicate with the Cloud Android instance.
SSH_FLAGS = [
'-q', '-o UserKnownHostsFile=/dev/null', '-o "StrictHostKeyChecking no"',
diff --git a/public/acloud_main.py b/public/acloud_main.py
index 777da3d..32449d4 100644
--- a/public/acloud_main.py
+++ b/public/acloud_main.py
@@ -102,6 +102,7 @@
from acloud.setup import setup
from acloud.setup import setup_args
+
LOGGING_FMT = "%(asctime)s |%(levelname)s| %(module)s:%(lineno)s| %(message)s"
ACLOUD_LOGGER = "acloud"
diff --git a/public/actions/common_operations.py b/public/actions/common_operations.py
index ad78471..5a94c97 100644
--- a/public/actions/common_operations.py
+++ b/public/actions/common_operations.py
@@ -32,6 +32,7 @@
from acloud.internal import constants
from acloud.internal.lib import utils
+
logger = logging.getLogger(__name__)
diff --git a/public/actions/create_goldfish_action.py b/public/actions/create_goldfish_action.py
index 1cc28cf..fa569d9 100644
--- a/public/actions/create_goldfish_action.py
+++ b/public/actions/create_goldfish_action.py
@@ -31,6 +31,7 @@
from acloud.internal.lib import goldfish_compute_client
from acloud.internal.lib import utils
+
logger = logging.getLogger(__name__)
_EMULATOR_INFO_FILENAME = "emulator-info.txt"
diff --git a/public/avd.py b/public/avd.py
index 52957fa..c558cdc 100755
--- a/public/avd.py
+++ b/public/avd.py
@@ -31,6 +31,7 @@
import logging
+
logger = logging.getLogger(__name__)
diff --git a/public/config.py b/public/config.py
index 888f185..78f4d1b 100755
--- a/public/config.py
+++ b/public/config.py
@@ -55,12 +55,13 @@
from acloud.internal.proto import user_config_pb2
from acloud.create import create_args
+
+logger = logging.getLogger(__name__)
+
_CONFIG_DATA_PATH = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "data")
_DEFAULT_CONFIG_FILE = "acloud.config"
-logger = logging.getLogger(__name__)
-
def GetDefaultConfigFile():
"""Return path to default config file."""
diff --git a/public/device_driver.py b/public/device_driver.py
index 7eecd11..b13b053 100755
--- a/public/device_driver.py
+++ b/public/device_driver.py
@@ -47,6 +47,7 @@
from acloud.internal.lib import gstorage_client
from acloud.internal.lib import utils
+
logger = logging.getLogger(__name__)
MAX_BATCH_CLEANUP_COUNT = 100
diff --git a/public/report.py b/public/report.py
index 061cfe6..bd81839 100755
--- a/public/report.py
+++ b/public/report.py
@@ -59,6 +59,7 @@
import logging
import os
+
logger = logging.getLogger(__name__)