[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0
Michael DeHaan
mdehaan at redhat.com
Wed Apr 25 20:00:45 UTC 2007
Hello,
This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.
Updating branch, master,
via 1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0 (commit)
from af92497d56eff0be322ce25e590db68237e75e70 (commit)
- Log -----------------------------------------------------------------
commit 1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date: Wed Apr 25 16:01:37 2007 -0400
Two things.
(A) update the WUI task/edit page so it can be used programmatically (even
if not linked) to feed taskatron from the WUI.
(B) add a configurable setting in the settings file for adjusting log
level. Defaults to "INFO". Turning on DEBUG with taskatron is quite
undesirable as it will result it 300MB log files. Which probably means
having a seperate config file for taskatron will soon be useful.
-----------------------------------------------------------------------
Diffstat:
build/settings | 1 +
service/server/db_util.py | 18 ++++----
service/server/logger.py | 10 ++++-
service/settings | 1 +
wui/src/app/controllers/task_controller.rb | 23 +++++++++--
wui/src/app/util/codes.rb | 19 ++++++---
wui/src/app/views/task/edit.rhtml | 57 ++++++++++++++++++++--------
7 files changed, 91 insertions(+), 38 deletions(-)
diff --git a/build/settings b/build/settings
index 210a0cd..9873ba6 100755
--- a/build/settings
+++ b/build/settings
@@ -16,3 +16,4 @@ extras_rpms:
- koan
- python-cheetah
- yum-utils
+loglevel: 'INFO'
diff --git a/service/server/db_util.py b/service/server/db_util.py
index 439e894..a807183 100755
--- a/service/server/db_util.py
+++ b/service/server/db_util.py
@@ -150,11 +150,11 @@ class DbUtil(object):
table_clause = " FROM " + ",".join(table_names)
buf = "SELECT " + fields_clause + " " + table_clause + " " + where_clause + order_by_clause + " LIMIT ?,?"
- self.logger.info( "QUERY: %s" % buf)
- self.logger.info( "OFFSET, LIMIT: %s, %s" % (offset,limit))
+ self.logger.debug( "QUERY: %s" % buf)
+ self.logger.debug( "OFFSET, LIMIT: %s, %s" % (offset,limit))
self.cursor.execute(buf, (offset,limit))
results = self.cursor.fetchall()
- self.logger.info("RESULTS OF QUERY: %s" % results)
+ self.logger.debug("RESULTS OF QUERY: %s" % results)
if results is None:
return success([])
@@ -180,7 +180,7 @@ class DbUtil(object):
result_hash[table][real_field] = result
result_list.append(result_hash)
- self.logger.info("SUCCESS, list=%s" % result_list)
+ self.logger.debug("SUCCESS, list=%s" % result_list)
if return_single:
return success(result_hash)
@@ -206,8 +206,8 @@ class DbUtil(object):
buf = "UPDATE " + self.db_schema["table"] + " SET "
buf = buf + ", ".join([x + "=:" + x for x in edit_keys])
buf = buf + " WHERE id=:id"
- self.logger.info("SQL = %s" % buf)
- self.logger.info("ARGS = %s" % args)
+ self.logger.debug("SQL = %s" % buf)
+ self.logger.debug("ARGS = %s" % args)
self.cursor.execute(buf, args)
self.connection.commit()
return success() # FIXME: is this what edit should return?
@@ -228,8 +228,8 @@ class DbUtil(object):
lock.acquire()
try:
- self.logger.info("SQL = %s" % buf)
- self.logger.info("ARGS = %s" % args)
+ self.logger.debug("SQL = %s" % buf)
+ self.logger.debug("ARGS = %s" % args)
self.cursor.execute(buf, args)
self.connection.commit()
except Exception:
@@ -244,7 +244,7 @@ class DbUtil(object):
rowid = self.cursor.lastrowid
lock.release()
- self.logger.info("SUCCESS, rowid= %s" % rowid)
+ self.logger.debug("SUCCESS, rowid= %s" % rowid)
return success(rowid)
def simple_delete(self,args):
diff --git a/service/server/logger.py b/service/server/logger.py
index cd4f73b..9fef992 100755
--- a/service/server/logger.py
+++ b/service/server/logger.py
@@ -17,6 +17,7 @@
import logging
+import config_data
# from the comments in http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
class Singleton(object):
@@ -30,7 +31,12 @@ class Singleton(object):
class Logger(Singleton):
__no_handlers = True
def __init__(self):
-
+
+ self.config = config_data.Config().get()
+ if self.config.has_key("loglevel"):
+ self.loglevel = logging._levelNames[self.config["loglevel"]]
+ else:
+ self.loglevel = logging.INFO
self.__setup_logging()
if self.__no_handlers:
self.__setup_handlers()
@@ -40,7 +46,7 @@ class Logger(Singleton):
def __setup_handlers(self):
handler = logging.FileHandler(logfilepath, "a")
- self.logger.setLevel(logging.DEBUG)
+ self.logger.setLevel(self.loglevel)
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
handler.setFormatter(formatter)
self.logger.addHandler(handler)
diff --git a/service/settings b/service/settings
index 6101b10..2d38ae5 100755
--- a/service/settings
+++ b/service/settings
@@ -16,3 +16,4 @@ extras_rpms:
- koan
- python-cheetah
- yum-utils
+loglevel: 'INFO'
diff --git a/wui/src/app/controllers/task_controller.rb b/wui/src/app/controllers/task_controller.rb
index e3fce9d..f738898 100755
--- a/wui/src/app/controllers/task_controller.rb
+++ b/wui/src/app/controllers/task_controller.rb
@@ -32,6 +32,13 @@ class TaskController < AbstractObjectController
@users = ManagedObject.retrieve_all(User, get_login).collect do |entry|
[ entry.username, entry.id ]
end
+ @machines = ManagedObject.retrieve_all(Machine, get_login).collect do |entry|
+ [ entry.hostname, entry.id ]
+ end
+ @deployments = ManagedObject.retrieve_all(Deployment, get_login).collect do |entry|
+ [ entry.display_name, entry.id ]
+ end
+
# FIXME: for consistancy this should be in codes-lookup.rb
@states = [
[ "Queued", TASK_STATE_QUEUED ],
@@ -40,13 +47,19 @@ class TaskController < AbstractObjectController
[ "Failed", TASK_STATE_FAILED ],
[ "Finished", TASK_STATE_FINISHED ]
]
- @operations = [
- [ "Sync Provisioning", TASK_OPERATION_COBBLER_SYNC ],
- [ "Install Baremetal System", TASK_OPERATION_INSTALL_METAL ],
- [ "Install Virtualized System", TASK_OPERATION_INSTALL_VIRT ],
- [ "Sync Recipes", TASK_OPERATION_PUPPET_SYNC ]
+ @action_types = [
+ [ "Install Virt", TASK_OPERATION_INSTALL_VIRT ],
+ [ "Delete Virt", TASK_OPERATION_DELETE_VIRT ],
+ [ "Start Virt", TASK_OPERATION_START_VIRT ],
+ [ "Shutdown Virt", TASK_OPERATION_SHUTDOWN_VIRT ],
+ [ "Pause Virt", TASK_OPERATION_PAUSE_VIRT ],
+ [ "Unpause Virt", TASK_OPERATION_UNPAUSE_VIRT ],
+ [ "Destroy Virt", TASK_OPERATION_DESTROY_VIRT ],
+ [ "Test", TASK_OPERATION_TEST ],
]
@users.insert(0,EMPTY_ENTRY)
+ @machines.insert(0,EMPTY_ENTRY)
+ @deployments.insert(0,EMPTY_ENTRY)
# FIXME: finish
end
diff --git a/wui/src/app/util/codes.rb b/wui/src/app/util/codes.rb
index f97dba8..5cfc52d 100755
--- a/wui/src/app/util/codes.rb
+++ b/wui/src/app/util/codes.rb
@@ -34,12 +34,19 @@ REASON_RANGE = "range"
REASON_REQUIRED = "required"
REASON_TYPE = "type"
SUCCESS = 0
-TASK_OPERATION_COBBLER_SYNC = "cobbler_sync"
-TASK_OPERATION_INSTALL_METAL = "install_metal"
+
TASK_OPERATION_INSTALL_VIRT = "install_virt"
-TASK_OPERATION_PUPPET_SYNC = "puppet_sync"
-TASK_STATE_FAILED = "failed"
-TASK_STATE_FINISHED = "finished"
-TASK_STATE_PAUSED = "paused"
+TASK_OPERATION_DELETE_VIRT = "delete_virt"
+TASK_OPERATION_START_VIRT = "start_virt"
+TASK_OPERATION_SHUTDOWN_VIRT = "shutdown_virt"
+TASK_OPERATION_PAUSE_VIRT = "pause_virt"
+TASK_OPERATION_UNPAUSE_VIRT = "unpause_virt"
+TASK_OPERATION_DESTROY_VIRT = "destroy_virt"
+TASK_OPERATION_TEST = "test"
+
TASK_STATE_QUEUED = "queued"
TASK_STATE_RUNNING = "running"
+TASK_STATE_PAUSED = "paused"
+TASK_STATE_FAILED = "failed"
+TASK_STATE_FINISHED = "finished"
+
diff --git a/wui/src/app/views/task/edit.rhtml b/wui/src/app/views/task/edit.rhtml
index 7cc05bf..1077464 100755
--- a/wui/src/app/views/task/edit.rhtml
+++ b/wui/src/app/views/task/edit.rhtml
@@ -12,6 +12,7 @@
-->
<TABLE BORDER=0>
+
<TR>
<TD>User</TD>
<TD><%= if @operation == "add"
@@ -23,38 +24,62 @@
end %>
</TD>
</TR>
- <TR>
- <TD>State</TD>
- <%# FIXME: different types of valid states depending on add vs. edit %>
- <TD><%= f.select :state, @states %></TD>
- </TR>
+
<TR>
- <TD>Operation</TD>
+ <TD>Action Type</TD>
<TD><%= if @operation == "add"
- f.select :operation, @operations
+ f.select :action_type, @action_types
else
- @item.operation
+ @item.action_type
end
%>
</TD>
</TR>
+
<TR>
- <TD>Parameters</TD>
+ <TD>Machine</TD>
+ <TD><%= if @operation == "add"
+ f.select :machine_id, @machines
+ else
+ @item.machine.hostname
+ end
+ %>
+ </TD>
+ </TR>
+
+ <TR>
+ <TD>Deployment</TD>
+ <TD><%= if @operation == "add"
+ f.select :deployment_id, @deployments
+ else
+ @item.deployment.display_name
+ end
+ %>
+ </TD>
+ </TR>
+
+ <TR>
+ <TD>State</TD>
<TD><%= if @operation == "add"
- f.text_field :parameters
+ f.select :state, @states
else
- @item.parameters
- end
+ @item.state
+ end
%>
</TD>
</TR>
- <% if @operation == "edit" %>
- <TR>
+
+ <TR>
<TD>Time</TD>
- <%= @item.time %>
+ <TD><%= if @operation == "add"
+ f.text_field :time
+ else
+ @item.time
+ end
+ %>
</TD>
</TR>
- <% end %>
+
<TR>
<TD COLSPAN="2"><input type="submit" value="go"></TD>
</TR>
hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
af92497d56eff0be322ce25e590db68237e75e70 \
1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0
More information about the Et-mgmt-commits-list
mailing list