more logging

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
This commit is contained in:
Adam Stokes 2015-06-23 13:09:26 -04:00
parent d480c49415
commit 7ca2624fb1
3 changed files with 14 additions and 1 deletions

View File

@ -22,6 +22,7 @@ import urwid.curses_display
from subiquity.palette import STYLES, STYLES_MONO from subiquity.palette import STYLES, STYLES_MONO
from subiquity.app import Application from subiquity.app import Application
from subiquity.log import setup_logger from subiquity.log import setup_logger
from subiquity import __version__ as VERSION
def parse_options(argv): def parse_options(argv):
@ -38,7 +39,8 @@ def main():
opts = parse_options(sys.argv[1:]) opts = parse_options(sys.argv[1:])
setup_logger() setup_logger()
logger = logging.getLogger('subiquity') logger = logging.getLogger('subiquity')
logger.info("Starting SUbiquity v{}".format(VERSION))
logger.info("Arguments passed: {}".format(sys.argv))
if opts.run_on_serial: if opts.run_on_serial:
# screen = urwid.curses_display.Screen() # screen = urwid.curses_display.Screen()
screen = urwid.raw_display.Screen() screen = urwid.raw_display.Screen()

View File

@ -13,9 +13,13 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
log = logging.getLogger('subiquity.controller')
class BaseControllerError(Exception): class BaseControllerError(Exception):
""" Basecontroller exception """ """ Basecontroller exception """
pass pass
@ -56,12 +60,14 @@ class BaseController(metaclass=ABCMeta):
def next_controller(self, *args, **kwds): def next_controller(self, *args, **kwds):
next_controller = self.routes.next() next_controller = self.routes.next()
log.debug("Loading next controller: {}".format(next_controller))
next_controller(routes=self.routes, next_controller(routes=self.routes,
application=self.application).show(*args, **kwds) application=self.application).show(*args, **kwds)
self.application.redraw_screen() self.application.redraw_screen()
def prev_controller(self, *args, **kwds): def prev_controller(self, *args, **kwds):
prev_controller = self.routes.prev() prev_controller = self.routes.prev()
log.debug("Loading previous controller: {}".format(prev_controller))
prev_controller(routes=self.routes, prev_controller(routes=self.routes,
application=self.application).show(*args, **kwds) application=self.application).show(*args, **kwds)
self.application.redraw_screen() self.application.redraw_screen()

View File

@ -13,6 +13,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from urwid import (WidgetWrap, ListBox, Pile, BoxAdapter) from urwid import (WidgetWrap, ListBox, Pile, BoxAdapter)
from subiquity.ui.lists import SimpleList from subiquity.ui.lists import SimpleList
from subiquity.ui.anchors import Header, Footer from subiquity.ui.anchors import Header, Footer
@ -20,8 +21,12 @@ from subiquity.ui.buttons import confirm_btn, cancel_btn
from subiquity.ui.utils import Padding, Color from subiquity.ui.utils import Padding, Color
log = logging.getLogger('subiquity.installpathView')
class InstallpathView(WidgetWrap): class InstallpathView(WidgetWrap):
def __init__(self, model, cb): def __init__(self, model, cb):
log.debug("In install path view")
Header.title = "15.10" Header.title = "15.10"
Header.excerpt = ("Welcome to Ubuntu! The worlds favourite platform " Header.excerpt = ("Welcome to Ubuntu! The worlds favourite platform "
"for clouds, clusters and amazing internet things. " "for clouds, clusters and amazing internet things. "