x/timmy
Code Issues Proposed changes

Move default rqfile to rq directory

Browse Source
This commit is contained in:
f3flight 2016-08-02 12:23:58 +00:00
parent a339a2614e
commit e0f53fd6ad
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -2,4 +2,3 @@ recursive-include rq *
recursive-include doc * recursive-include doc *
include README.md include README.md
include config.yaml include config.yaml
include rq.yaml

2
setup.py
View File

@ -24,7 +24,7 @@ pname = project_name
dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname) dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname)
rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files]) rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files])
for root, dirs, files in os.walk('rq')] for root, dirs, files in os.walk('rq')]
rqfiles.append((os.path.join(dtm, 'configs'), ['config.yaml', 'rq.yaml'])) rqfiles.append((os.path.join(dtm, 'configs'), ['config.yaml']))
package_data = True package_data = True
if os.environ.get("READTHEDOCS", False): if os.environ.get("READTHEDOCS", False):

6
timmy/conf.py
View File

@ -39,15 +39,13 @@ def load_conf(filename):
conf['timeout'] = 15 conf['timeout'] = 15
conf['prefix'] = 'nice -n 19 ionice -c 3' conf['prefix'] = 'nice -n 19 ionice -c 3'
rqdir = 'rq' rqdir = 'rq'
rqfile = 'rq.yaml' rqfile = 'rq/default.yaml'
dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', 'timmy') dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', 'timmy')
if os.path.isdir(os.path.join(dtm, rqdir)): if os.path.isdir(os.path.join(dtm, rqdir)):
conf['rqdir'] = os.path.join(dtm, rqdir) conf['rqdir'] = os.path.join(dtm, rqdir)
conf['rqfile'] = os.path.join(conf['rqdir'], rqfile)
else: else:
conf['rqdir'] = rqdir conf['rqdir'] = rqdir
if os.path.isfile(os.path.join(dtm, 'configs', rqfile)):
conf['rqfile'] = os.path.join(dtm, 'configs', rqfile)
else:
conf['rqfile'] = rqfile conf['rqfile'] = rqfile
conf['compress_timeout'] = 3600 conf['compress_timeout'] = 3600
conf['outdir'] = os.path.join(gettempdir(), 'timmy', 'info') conf['outdir'] = os.path.join(gettempdir(), 'timmy', 'info')

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.12.0' version = '1.12.2'
if __name__ == '__main__': if __name__ == '__main__':
exit(0) exit(0)