OSDN > Find Software > System > pysilhouette > SCM > git > pysilhouette.git > Commit

pysilhouette
Fork

pysilhouette.git: Commit

メインリポジトリ

Revision	86c57c581b7435f5918b893c68d6e26659f81ce6 (tree)
Time	2010-02-08 16:56:52
Author	Kei Funagayama <kei.topaz@gmai...>
Commiter	Kei Funagayama

typo

--- a/INSTALL

+++ b/INSTALL

		@@ -80,7 +80,7 @@ One can use psil-set to register jobs from command line.
80	80	configuration file
81	81	-a ACTION, --action=ACTION
82	82	action command
83		- -t TYPE, --type=TYPE Run type. "serial" or "paralle"
	83	+ -t TYPE, --type=TYPE Run type. "serial" or "parallel"
84	84	-m NAME, --name=NAME action name
85	85	-r ROLLBACK, --rollback=ROLLBACK
86	86	rollback command

--- a/INSTALL.ja

+++ b/INSTALL.ja

		@@ -90,7 +90,7 @@ psil-setを使用して、コマンドラインからジョブを登録するこ
90	90	configuration file
91	91	-a ACTION, --action=ACTION
92	92	action command
93		- -t TYPE, --type=TYPE Run type. "serial" or "paralle"
	93	+ -t TYPE, --type=TYPE Run type. "serial" or "parallel"
94	94	-m NAME, --name=NAME action name
95	95	-r ROLLBACK, --rollback=ROLLBACK
96	96	rollback command

--- a/pysilhouette/asynperformer.py

+++ b/pysilhouette/asynperformer.py

		@@ -89,7 +89,7 @@ class AsynPerformer(ER):
89	89	continue
90	90
91	91	m_jgs = jobgroup_findbytype_limit_status(session,
92		- JOBGROUP_TYPE['PARALLE'],
	92	+ JOBGROUP_TYPE['PARALLEL'],
93	93	int(self.cf['asynperformer.thread.pool.size']) - tq.now_alive())
94	94
95	95	session.close()

--- a/pysilhouette/db/model.py

+++ b/pysilhouette/db/model.py

--- a/pysilhouette/worker.py

+++ b/pysilhouette/worker.py

		@@ -393,8 +393,8 @@ def dummy_set_job(cf, number, action, rollback, finish, type, db=None):
393	393	jg.finish_command = unicode(finish, "utf-8")
394	394	if type == 'serial':
395	395	jg.type = JOBGROUP_TYPE['SERIAL']
396		- elif type == 'paralle':
397		- jg.type = JOBGROUP_TYPE['PARALLE']
	396	+ elif type == 'parallel':
	397	+ jg.type = JOBGROUP_TYPE['PARALLEL']
398	398	else:
399	399	jg.type = JOBGROUP_TYPE['SERIAL']
400	400

		@@ -433,7 +433,7 @@ if __name__ == '__main__':
433	433	import sys
434	434	pysilhouette.log.reload_conf(pysilhouette.cf["env.sys.log.conf.path"])
435	435	number = 50
436		- dummy_set_job(pysilhouette.cf,number,'echo "aaaaaa"','echo "bbbbb"','echo "cccc"','paralle')
	436	+ dummy_set_job(pysilhouette.cf,number,'echo "aaaaaa"','echo "bbbbb"','echo "cccc"','parallel')
437	437	try:
438	438	db = Database(pysilhouette.cf['database.url'],encoding="utf-8",convert_unicode=True,echo=True,echo_pool=True)
439	439	reload_mappers(db.get_metadata())

		@@ -443,7 +443,7 @@ if __name__ == '__main__':
443	443	raise
444	444
445	445	from pysilhouette.db.access import jobgroup_findbytype_status
446		- m_jgs = jobgroup_findbytype_status(session, JOBGROUP_TYPE['PARALLE'])
	446	+ m_jgs = jobgroup_findbytype_status(session, JOBGROUP_TYPE['PARALLEL'])
447	447	for m_jg in m_jgs:
448	448	try:
449	449	tq.put(ThreadWorker(pysilhouette.cf, db, m_jg.id))

--- a/tool/psil-set

+++ b/tool/psil-set

		@@ -47,7 +47,7 @@ def getopts():
47	47	optp.add_option('-a', '--action', dest='action', action="store", type='string',
48	48	help='action command')
49	49	optp.add_option('-t', '--type', dest='type', action="store", type='string',
50		- help='Run type. "serial" or "paralle"')
	50	+ help='Run type. "serial" or "parallel"')
51	51	optp.add_option('-m', '--name', dest='name', action="store", type='string',
52	52	help='action name')
53	53	optp.add_option('-r', '--rollback', dest='rollback', action="store", type='string',

		@@ -126,8 +126,8 @@ def main():
126	126	jg.finish_command = unicode(opts.finish, "utf-8")
127	127	if opts.type == 'serial':
128	128	jg.type = JOBGROUP_TYPE['SERIAL']
129		- elif opts.type == 'paralle':
130		- jg.type = JOBGROUP_TYPE['PARALLE']
	129	+ elif opts.type == 'parallel':
	130	+ jg.type = JOBGROUP_TYPE['PARALLEL']
131	131	else:
132	132	jg.type = JOBGROUP_TYPE['SERIAL']
133	133