author | Julien Cristau <julien.cristau@logilab.fr> |
Wed, 30 Sep 2015 16:52:29 +0200 | |
changeset 10738 | 675e47b1b875 |
parent 10662 | 10942ed172de |
child 10823 | 48f59820ff78 |
permissions | -rw-r--r-- |
9797
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
1 |
# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
2 |
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
3 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
4 |
# This file is part of CubicWeb. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
5 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
6 |
# CubicWeb is free software: you can redistribute it and/or modify it under the |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
7 |
# terms of the GNU Lesser General Public License as published by the Free |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
8 |
# Software Foundation, either version 2.1 of the License, or (at your option) |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
9 |
# any later version. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
10 |
# |
5424
8ecbcbff9777
replace logilab-common by CubicWeb in disclaimer
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5421
diff
changeset
|
11 |
# CubicWeb is distributed in the hope that it will be useful, but WITHOUT |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
13 |
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
14 |
# details. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
15 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
16 |
# You should have received a copy of the GNU Lesser General Public License along |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5410
diff
changeset
|
17 |
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>. |
5967 | 18 |
"""cubicweb-ctl commands and command handlers specific to the repository""" |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
19 |
from __future__ import print_function |
0 | 20 |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
21 |
__docformat__ = 'restructuredtext en' |
0 | 22 |
|
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4670
diff
changeset
|
23 |
# *ctl module should limit the number of import to be imported as quickly as |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4670
diff
changeset
|
24 |
# possible (for cubicweb-ctl reactivity, necessary for instance for usable bash |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4670
diff
changeset
|
25 |
# completion). So import locally in command helpers. |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
26 |
import sys |
0 | 27 |
import os |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
28 |
from contextlib import contextmanager |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
29 |
import logging |
8233
9b9180969892
[c-c] use subprocess instead of os.system to start repository
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7815
diff
changeset
|
30 |
import subprocess |
0 | 31 |
|
10612
84468b90e9c1
[py3k] basestring → six.string_types
Rémi Cardona <remi.cardona@logilab.fr>
parents:
10589
diff
changeset
|
32 |
from six import string_types |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
33 |
from six.moves import input |
10612
84468b90e9c1
[py3k] basestring → six.string_types
Rémi Cardona <remi.cardona@logilab.fr>
parents:
10589
diff
changeset
|
34 |
|
6867
f691757792f9
[c-c delete] closes #1433117 and other flavours where we don't want to crash on error
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6863
diff
changeset
|
35 |
from logilab.common import nullobject |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
36 |
from logilab.common.configuration import Configuration, merge_options |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
37 |
from logilab.common.shellutils import ASK, generate_password |
0 | 38 |
|
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
39 |
from logilab.database import get_db_helper, get_connection |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
40 |
|
2790
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2711
diff
changeset
|
41 |
from cubicweb import AuthenticationError, ExecutionError, ConfigurationError |
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2711
diff
changeset
|
42 |
from cubicweb.toolsutils import Command, CommandHandler, underline_title |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
43 |
from cubicweb.cwctl import CWCTL, check_options_consistency, ConfigureInstanceCommand |
2105
92ea410806fe
refactor sources configuration, add source to sources when using a cube defining
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1980
diff
changeset
|
44 |
from cubicweb.server import SOURCE_TYPES |
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
45 |
from cubicweb.server.serverconfig import ( |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
46 |
USER_OPTIONS, ServerConfiguration, SourceConfiguration, |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
47 |
ask_source_config, generate_source_config) |
0 | 48 |
|
49 |
# utility functions ########################################################### |
|
50 |
||
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
51 |
def source_cnx(source, dbname=None, special_privs=False, interactive=True): |
0 | 52 |
"""open and return a connection to the system database defined in the |
53 |
given server.serverconfig |
|
54 |
""" |
|
55 |
from getpass import getpass |
|
4218
deb2dcffb301
[cwctl] reset-admin-pwd was failing when db-host was not set
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4212
diff
changeset
|
56 |
dbhost = source.get('db-host') |
0 | 57 |
if dbname is None: |
58 |
dbname = source['db-name'] |
|
59 |
driver = source['db-driver'] |
|
6060
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
60 |
dbhelper = get_db_helper(driver) |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
61 |
if interactive: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
62 |
print('-> connecting to %s database' % driver, end=' ') |
5754
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
63 |
if dbhost: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
64 |
print('%s@%s' % (dbname, dbhost), end=' ') |
5754
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
65 |
else: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
66 |
print(dbname, end=' ') |
6060
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
67 |
if dbhelper.users_support: |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
68 |
if not interactive or (not special_privs and source.get('db-user')): |
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
69 |
user = source.get('db-user', os.environ.get('USER', '')) |
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
70 |
if interactive: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
71 |
print('as', user) |
6860
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
72 |
password = source.get('db-password') |
0 | 73 |
else: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
74 |
print() |
6060
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
75 |
if special_privs: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
76 |
print('WARNING') |
6060
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
77 |
print ('the user will need the following special access rights ' |
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
78 |
'on the database:') |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
79 |
print(special_privs) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
80 |
print() |
6072
9d83b214066a
[db-create] fix bug introduced by 6060:353bec342e2a (we ask for user while in non verbose mode)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6060
diff
changeset
|
81 |
default_user = source.get('db-user', os.environ.get('USER', '')) |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
82 |
user = input('Connect as user ? [%r]: ' % default_user) |
6860
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
83 |
user = user.strip() or default_user |
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
84 |
if user == source.get('db-user'): |
6939
8fa55cf2a8cb
[c-c] fix crash on delete instance + potential others when user don't specify db user's password
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6867
diff
changeset
|
85 |
password = source.get('db-password') |
6072
9d83b214066a
[db-create] fix bug introduced by 6060:353bec342e2a (we ask for user while in non verbose mode)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6060
diff
changeset
|
86 |
else: |
9d83b214066a
[db-create] fix bug introduced by 6060:353bec342e2a (we ask for user while in non verbose mode)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6060
diff
changeset
|
87 |
password = getpass('password: ') |
6060
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
88 |
else: |
353bec342e2a
[db create] don't ask user/password if the underlying db doesn't support it (eg sqlite)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5990
diff
changeset
|
89 |
user = password = None |
4180
9fb0d06926cc
more extra_args cleanup
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
4177
diff
changeset
|
90 |
extra_args = source.get('db-extra-arguments') |
9fb0d06926cc
more extra_args cleanup
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
4177
diff
changeset
|
91 |
extra = extra_args and {'extra_args': extra_args} or {} |
4837
54969eec48eb
misc fixes to ensure logilab.db compatibility
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
92 |
cnx = get_connection(driver, dbhost, dbname, user, password=password, |
54969eec48eb
misc fixes to ensure logilab.db compatibility
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
93 |
port=source.get('db-port'), |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
94 |
schema=source.get('db-namespace'), |
4837
54969eec48eb
misc fixes to ensure logilab.db compatibility
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
95 |
**extra) |
4845 | 96 |
try: |
97 |
cnx.logged_user = user |
|
98 |
except AttributeError: |
|
99 |
# C object, __slots__ |
|
4848
41f84eea63c9
rename logilab.db into logilab.database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4845
diff
changeset
|
100 |
from logilab.database import _SimpleConnectionWrapper |
4845 | 101 |
cnx = _SimpleConnectionWrapper(cnx) |
102 |
cnx.logged_user = user |
|
4837
54969eec48eb
misc fixes to ensure logilab.db compatibility
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
103 |
return cnx |
0 | 104 |
|
136
ff51a18c66a3
ask less questions on instance creation
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
0
diff
changeset
|
105 |
def system_source_cnx(source, dbms_system_base=False, |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
106 |
special_privs='CREATE/DROP DATABASE', interactive=True): |
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
107 |
"""shortcut to get a connextion to the instance system database |
0 | 108 |
defined in the given config. If <dbms_system_base> is True, |
109 |
connect to the dbms system database instead (for task such as |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
110 |
create/drop the instance database) |
0 | 111 |
""" |
112 |
if dbms_system_base: |
|
4831
c5aec27c1bf7
[repo] use logilab.db instead of lgc.adbh/lgc.db/lgc.sqlgen/indexer, test new date extranction functions
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
113 |
system_db = get_db_helper(source['db-driver']).system_database() |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
114 |
return source_cnx(source, system_db, special_privs=special_privs, |
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
115 |
interactive=interactive) |
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
116 |
return source_cnx(source, special_privs=special_privs, |
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
117 |
interactive=interactive) |
0 | 118 |
|
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
119 |
def _db_sys_cnx(source, special_privs, interactive=True): |
6860
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
120 |
"""return a connection on the RDMS system table (to create/drop a user or a |
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
121 |
database) |
0 | 122 |
""" |
2417
18a14c23413c
should ensure lgc is configured to not use mx to avoid error if backend module is missing mx support
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2107
diff
changeset
|
123 |
import logilab.common as lgp |
18a14c23413c
should ensure lgc is configured to not use mx to avoid error if backend module is missing mx support
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2107
diff
changeset
|
124 |
lgp.USE_MX_DATETIME = False |
0 | 125 |
driver = source['db-driver'] |
4831
c5aec27c1bf7
[repo] use logilab.db instead of lgc.adbh/lgc.db/lgc.sqlgen/indexer, test new date extranction functions
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
126 |
helper = get_db_helper(driver) |
0 | 127 |
# connect on the dbms system base to create our base |
6860
a0dbf6135c72
[db-create] we should always ask db user that should be used when special privileges are required
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6779
diff
changeset
|
128 |
cnx = system_source_cnx(source, True, special_privs=special_privs, |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
129 |
interactive=interactive) |
0 | 130 |
# disable autocommit (isolation_level(1)) because DROP and |
131 |
# CREATE DATABASE can't be executed in a transaction |
|
7577
9892937d9041
[all] remove pattern "try: function() except AttributeError: pass" (closes #1787966)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
7569
diff
changeset
|
132 |
set_isolation_level = getattr(cnx, 'set_isolation_level', None) |
9892937d9041
[all] remove pattern "try: function() except AttributeError: pass" (closes #1787966)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
7569
diff
changeset
|
133 |
if set_isolation_level is not None: |
0 | 134 |
# set_isolation_level() is psycopg specific |
7577
9892937d9041
[all] remove pattern "try: function() except AttributeError: pass" (closes #1787966)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
7569
diff
changeset
|
135 |
set_isolation_level(0) |
0 | 136 |
return cnx |
1469 | 137 |
|
0 | 138 |
def repo_cnx(config): |
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
139 |
"""return a in-memory repository and a repoapi connection to it""" |
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
140 |
from cubicweb import repoapi |
0 | 141 |
from cubicweb.server.utils import manager_userpasswd |
142 |
try: |
|
9460
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
143 |
login = config.default_admin_config['login'] |
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
144 |
pwd = config.default_admin_config['password'] |
0 | 145 |
except KeyError: |
146 |
login, pwd = manager_userpasswd() |
|
147 |
while True: |
|
148 |
try: |
|
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
149 |
repo = repoapi.get_repository(config=config) |
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
150 |
cnx = repoapi.connect(repo, login, password=pwd) |
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
151 |
return repo, cnx |
0 | 152 |
except AuthenticationError: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
153 |
print('-> Error: wrong user/password.') |
1682
36bd5cba09de
must reset cubes before next authentication
Graziella Toutoungis <graziella.toutoungis@logilab.fr>
parents:
1469
diff
changeset
|
154 |
# reset cubes else we'll have an assertion error on next retry |
36bd5cba09de
must reset cubes before next authentication
Graziella Toutoungis <graziella.toutoungis@logilab.fr>
parents:
1469
diff
changeset
|
155 |
config._cubes = None |
0 | 156 |
login, pwd = manager_userpasswd() |
1469 | 157 |
|
3904
dc7d315165fc
default_instance id should also be available when silently rebuilding soures file
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3893
diff
changeset
|
158 |
|
0 | 159 |
# repository specific command handlers ######################################## |
160 |
||
161 |
class RepositoryCreateHandler(CommandHandler): |
|
162 |
cmdname = 'create' |
|
163 |
cfgname = 'repository' |
|
164 |
||
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
165 |
def bootstrap(self, cubes, automatic=False, inputlevel=0): |
5967 | 166 |
"""create an instance by copying files from the given cube and by asking |
167 |
information necessary to build required configuration files |
|
0 | 168 |
""" |
169 |
config = self.config |
|
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
170 |
if not automatic: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
171 |
print(underline_title('Configuring the repository')) |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
172 |
config.input_config('email', inputlevel) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
173 |
print('\n'+underline_title('Configuring the sources')) |
0 | 174 |
sourcesfile = config.sources_file() |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
175 |
# hack to make Method('default_instance_id') usable in db option defs |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
176 |
# (in native.py) |
6299
51a9494b5efb
[sqlite] quick hacks to fix #1251873 and #1251874
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6184
diff
changeset
|
177 |
sconfig = SourceConfiguration(config, |
3904
dc7d315165fc
default_instance id should also be available when silently rebuilding soures file
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3893
diff
changeset
|
178 |
options=SOURCE_TYPES['native'].options) |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
179 |
if not automatic: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
180 |
sconfig.input_config(inputlevel=inputlevel) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
181 |
print() |
0 | 182 |
sourcescfg = {'system': sconfig} |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
183 |
if automatic: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
184 |
# XXX modify a copy |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
185 |
password = generate_password() |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
186 |
print('-> set administrator account to admin / %s' % password) |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
187 |
USER_OPTIONS[1][1]['default'] = password |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
188 |
sconfig = Configuration(options=USER_OPTIONS) |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
189 |
else: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
190 |
sconfig = Configuration(options=USER_OPTIONS) |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
191 |
sconfig.input_config(inputlevel=inputlevel) |
0 | 192 |
sourcescfg['admin'] = sconfig |
2105
92ea410806fe
refactor sources configuration, add source to sources when using a cube defining
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1980
diff
changeset
|
193 |
config.write_sources_file(sourcescfg) |
0 | 194 |
# remember selected cubes for later initialization of the database |
195 |
config.write_bootstrap_cubes_file(cubes) |
|
1469 | 196 |
|
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
197 |
def postcreate(self, automatic=False, inputlevel=0): |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
198 |
if automatic: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
199 |
CWCTL.run(['db-create', '--automatic', self.config.appid]) |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
200 |
elif ASK.confirm('Run db-create to create the system database ?'): |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
201 |
CWCTL.run(['db-create', '--config-level', str(inputlevel), |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
202 |
self.config.appid]) |
0 | 203 |
else: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
204 |
print('-> nevermind, you can do it later with ' |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
205 |
'"cubicweb-ctl db-create %s".' % self.config.appid) |
1469 | 206 |
|
6867
f691757792f9
[c-c delete] closes #1433117 and other flavours where we don't want to crash on error
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6863
diff
changeset
|
207 |
|
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
208 |
@contextmanager |
10124
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
209 |
def db_transaction(source, privilege): |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
210 |
"""Open a transaction to the instance database""" |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
211 |
cnx = system_source_cnx(source, special_privs=privilege) |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
212 |
cursor = cnx.cursor() |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
213 |
try: |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
214 |
yield cursor |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
215 |
except: |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
216 |
cnx.rollback() |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
217 |
cnx.close() |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
218 |
raise |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
219 |
else: |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
220 |
cnx.commit() |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
221 |
cnx.close() |
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
222 |
|
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
223 |
|
153c969b3a05
[serverctl] add db_transaction context manager
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10123
diff
changeset
|
224 |
@contextmanager |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
225 |
def db_sys_transaction(source, privilege): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
226 |
"""Open a transaction to the system database""" |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
227 |
cnx = _db_sys_cnx(source, privilege) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
228 |
cursor = cnx.cursor() |
6867
f691757792f9
[c-c delete] closes #1433117 and other flavours where we don't want to crash on error
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6863
diff
changeset
|
229 |
try: |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
230 |
yield cursor |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
231 |
except: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
232 |
cnx.rollback() |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
233 |
cnx.close() |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
234 |
raise |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
235 |
else: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
236 |
cnx.commit() |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
237 |
cnx.close() |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
238 |
|
0 | 239 |
|
240 |
class RepositoryDeleteHandler(CommandHandler): |
|
241 |
cmdname = 'delete' |
|
242 |
cfgname = 'repository' |
|
243 |
||
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
244 |
def _drop_namespace(self, source): |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
245 |
db_namespace = source.get('db-namespace') |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
246 |
with db_transaction(source, privilege='DROP SCHEMA') as cursor: |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
247 |
helper = get_db_helper(source['db-driver']) |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
248 |
helper.drop_schema(cursor, db_namespace) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
249 |
print('-> database schema %s dropped' % db_namespace) |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
250 |
|
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
251 |
def _drop_database(self, source): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
252 |
dbname = source['db-name'] |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
253 |
if source['db-driver'] == 'sqlite': |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
254 |
print('deleting database file %(db-name)s' % source) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
255 |
os.unlink(source['db-name']) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
256 |
print('-> database %(db-name)s dropped.' % source) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
257 |
else: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
258 |
helper = get_db_helper(source['db-driver']) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
259 |
with db_sys_transaction(source, privilege='DROP DATABASE') as cursor: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
260 |
print('dropping database %(db-name)s' % source) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
261 |
cursor.execute('DROP DATABASE "%(db-name)s"' % source) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
262 |
print('-> database %(db-name)s dropped.' % source) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
263 |
|
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
264 |
def _drop_user(self, source): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
265 |
user = source['db-user'] or None |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
266 |
if user is not None: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
267 |
with db_sys_transaction(source, privilege='DROP USER') as cursor: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
268 |
print('dropping user %s' % user) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
269 |
cursor.execute('DROP USER %s' % user) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
270 |
|
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
271 |
def _cleanup_steps(self, source): |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
272 |
# 1/ delete namespace if used |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
273 |
db_namespace = source.get('db-namespace') |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
274 |
if db_namespace: |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
275 |
yield ('Delete database namespace "%s"' % db_namespace, |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
276 |
self._drop_namespace, True) |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
277 |
# 2/ delete database |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
278 |
yield ('Delete database "%(db-name)s"' % source, |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
279 |
self._drop_database, True) |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
280 |
# 3/ delete user |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
281 |
helper = get_db_helper(source['db-driver']) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
282 |
if source['db-user'] and helper.users_support: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
283 |
# XXX should check we are not connected as user |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
284 |
yield ('Delete user "%(db-user)s"' % source, |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
285 |
self._drop_user, False) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
286 |
|
0 | 287 |
def cleanup(self): |
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
288 |
"""remove instance's configuration and database""" |
9460
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
289 |
source = self.config.system_source_config |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
290 |
for msg, step, default in self._cleanup_steps(source): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
291 |
if ASK.confirm(msg, default_is_yes=default): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
292 |
try: |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
293 |
step(source) |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
294 |
except Exception as exc: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
295 |
print('ERROR', exc) |
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
296 |
if ASK.confirm('An error occurred. Continue anyway?', |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
297 |
default_is_yes=False): |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
298 |
continue |
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
299 |
raise ExecutionError(str(exc)) |
0 | 300 |
|
1469 | 301 |
|
0 | 302 |
# repository specific commands ################################################ |
3954
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
303 |
|
5754
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
304 |
def createdb(helper, source, dbcnx, cursor, **kwargs): |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
305 |
if dbcnx.logged_user != source['db-user']: |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
306 |
helper.create_database(cursor, source['db-name'], source['db-user'], |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
307 |
source['db-encoding'], **kwargs) |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
308 |
else: |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
309 |
helper.create_database(cursor, source['db-name'], |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
310 |
dbencoding=source['db-encoding'], **kwargs) |
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
311 |
|
10123
c390c444de06
[server] refactor cleanup() code used by "cubicweb-ctl delete"
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10077
diff
changeset
|
312 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
313 |
class CreateInstanceDBCommand(Command): |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
314 |
"""Create the system database of an instance (run after 'create'). |
1469 | 315 |
|
0 | 316 |
You will be prompted for a login / password to use to connect to |
317 |
the system database. The given user should have almost all rights |
|
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
318 |
on the database (ie a super user on the DBMS allowed to create |
0 | 319 |
database, users, languages...). |
320 |
||
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
321 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
322 |
the identifier of the instance to initialize. |
0 | 323 |
""" |
324 |
name = 'db-create' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
325 |
arguments = '<instance>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
326 |
min_args = max_args = 1 |
0 | 327 |
options = ( |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
328 |
('automatic', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
329 |
{'short': 'a', 'action' : 'store_true', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
330 |
'default': False, |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
331 |
'help': 'automatic mode: never ask and use default answer to every ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
332 |
'question. this may require that your login match a database super ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
333 |
'user (allowed to create database & all).', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
334 |
}), |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
335 |
('config-level', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
336 |
{'short': 'l', 'type' : 'int', 'metavar': '<level>', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
337 |
'default': 0, |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
338 |
'help': 'configuration level (0..2): 0 will ask for essential ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
339 |
'configuration parameters only while 2 will ask for all parameters', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
340 |
}), |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
341 |
('create-db', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
342 |
{'short': 'c', 'type': 'yn', 'metavar': '<y or n>', |
0 | 343 |
'default': True, |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
344 |
'help': 'create the database (yes by default)' |
7112
bb27cc300040
[db connection] fix db connections method: verbose should be named interactive, it's not a question of verbosity but wether question should be asked or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7061
diff
changeset
|
345 |
}), |
0 | 346 |
) |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
347 |
|
0 | 348 |
def run(self, args): |
349 |
"""run the command with its specific arguments""" |
|
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
350 |
check_options_consistency(self.config) |
2969
d95f23a0fc3b
F add --automatic/-a option to run db-create without user input
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2851
diff
changeset
|
351 |
automatic = self.get('automatic') |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
352 |
appid = args.pop() |
0 | 353 |
config = ServerConfiguration.config_for(appid) |
9460
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
354 |
source = config.system_source_config |
4197
5446c74189b6
quick and dirty fix to avoid crash when running db-create command with an sqlite source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4180
diff
changeset
|
355 |
dbname = source['db-name'] |
0 | 356 |
driver = source['db-driver'] |
4831
c5aec27c1bf7
[repo] use logilab.db instead of lgc.adbh/lgc.db/lgc.sqlgen/indexer, test new date extranction functions
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
357 |
helper = get_db_helper(driver) |
4197
5446c74189b6
quick and dirty fix to avoid crash when running db-create command with an sqlite source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4180
diff
changeset
|
358 |
if driver == 'sqlite': |
5585
e1cbf6b304ea
[sqlite] fix crash on db-create with sqlite abd unexistent database due to missing paren in logical expression (closes #909604)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5553
diff
changeset
|
359 |
if os.path.exists(dbname) and ( |
e1cbf6b304ea
[sqlite] fix crash on db-create with sqlite abd unexistent database due to missing paren in logical expression (closes #909604)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5553
diff
changeset
|
360 |
automatic or |
e1cbf6b304ea
[sqlite] fix crash on db-create with sqlite abd unexistent database due to missing paren in logical expression (closes #909604)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5553
diff
changeset
|
361 |
ASK.confirm('Database %s already exists. Drop it?' % dbname)): |
4197
5446c74189b6
quick and dirty fix to avoid crash when running db-create command with an sqlite source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4180
diff
changeset
|
362 |
os.unlink(dbname) |
5754
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
363 |
elif self.config.create_db: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
364 |
print('\n'+underline_title('Creating the system database')) |
0 | 365 |
# connect on the dbms system base to create our base |
6939
8fa55cf2a8cb
[c-c] fix crash on delete instance + potential others when user don't specify db user's password
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6867
diff
changeset
|
366 |
dbcnx = _db_sys_cnx(source, 'CREATE/DROP DATABASE and / or USER', |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
367 |
interactive=not automatic) |
0 | 368 |
cursor = dbcnx.cursor() |
369 |
try: |
|
370 |
if helper.users_support: |
|
371 |
user = source['db-user'] |
|
2969
d95f23a0fc3b
F add --automatic/-a option to run db-create without user input
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2851
diff
changeset
|
372 |
if not helper.user_exists(cursor, user) and (automatic or \ |
d95f23a0fc3b
F add --automatic/-a option to run db-create without user input
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2851
diff
changeset
|
373 |
ASK.confirm('Create db user %s ?' % user, default_is_yes=False)): |
6939
8fa55cf2a8cb
[c-c] fix crash on delete instance + potential others when user don't specify db user's password
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6867
diff
changeset
|
374 |
helper.create_user(source['db-user'], source.get('db-password')) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
375 |
print('-> user %s created.' % user) |
0 | 376 |
if dbname in helper.list_databases(cursor): |
2969
d95f23a0fc3b
F add --automatic/-a option to run db-create without user input
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2851
diff
changeset
|
377 |
if automatic or ASK.confirm('Database %s already exists -- do you want to drop it ?' % dbname): |
7564
1d64c8d33156
[server] "overrule" case insensitivity of database name (closes: #611294)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7342
diff
changeset
|
378 |
cursor.execute('DROP DATABASE "%s"' % dbname) |
0 | 379 |
else: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
380 |
print('you may want to run "cubicweb-ctl db-init ' |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
381 |
'--drop %s" manually to continue.' % config.appid) |
0 | 382 |
return |
5754
51179e0bb250
[test] support for test on postgres database using the same mecanism as sqlite: one template database generated when necessary + actual test database created from the template
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5696
diff
changeset
|
383 |
createdb(helper, source, dbcnx, cursor) |
0 | 384 |
dbcnx.commit() |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
385 |
print('-> database %s created.' % dbname) |
7815
2a164a9cf81c
[exceptions] stop catching any exception in various places (closes #1942716)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7764
diff
changeset
|
386 |
except BaseException: |
0 | 387 |
dbcnx.rollback() |
388 |
raise |
|
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
389 |
cnx = system_source_cnx(source, special_privs='CREATE LANGUAGE/SCHEMA', |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
390 |
interactive=not automatic) |
0 | 391 |
cursor = cnx.cursor() |
4886
18a1735c283c
[db creation] fix some bugs introduced by the migration to logilab.database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4848
diff
changeset
|
392 |
helper.init_fti_extensions(cursor) |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
393 |
namespace = source.get('db-namespace') |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
394 |
if namespace and ASK.confirm('Create schema %s in database %s ?' |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
395 |
% (namespace, dbname)): |
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
396 |
helper.create_schema(cursor, namespace) |
7479
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
397 |
cnx.commit() |
1469 | 398 |
# postgres specific stuff |
0 | 399 |
if driver == 'postgres': |
7479
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
400 |
# install plpythonu/plpgsql languages |
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
401 |
langs = ('plpythonu', 'plpgsql') |
3115
29262ba01464
minimal steps to have cw running on windows
Aurélien Campéas
parents:
2969
diff
changeset
|
402 |
for extlang in langs: |
7479
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
403 |
if automatic or ASK.confirm('Create language %s ?' % extlang): |
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
404 |
try: |
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
405 |
helper.create_language(cursor, extlang) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
406 |
except Exception as exc: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
407 |
print('-> ERROR:', exc) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
408 |
print('-> could not create language %s, some stored procedures might be unusable' % extlang) |
7479
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
409 |
cnx.rollback() |
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
410 |
else: |
b0603fc4ed6d
[sql] implement #1631319: ask user before creating postgresql languages
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
7457
diff
changeset
|
411 |
cnx.commit() |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
412 |
print('-> database for instance %s created and necessary extensions installed.' % appid) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
413 |
print() |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
414 |
if automatic: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
415 |
CWCTL.run(['db-init', '--automatic', '--config-level', '0', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
416 |
config.appid]) |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
417 |
elif ASK.confirm('Run db-init to initialize the system database ?'): |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
418 |
CWCTL.run(['db-init', '--config-level', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
419 |
str(self.config.config_level), config.appid]) |
0 | 420 |
else: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
421 |
print('-> nevermind, you can do it later with ' |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
422 |
'"cubicweb-ctl db-init %s".' % config.appid) |
0 | 423 |
|
1469 | 424 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
425 |
class InitInstanceCommand(Command): |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
426 |
"""Initialize the system database of an instance (run after 'db-create'). |
1469 | 427 |
|
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
428 |
Notice this will be done using user specified in the sources files, so this |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
429 |
user should have the create tables grant permissions on the database. |
0 | 430 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
431 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
432 |
the identifier of the instance to initialize. |
0 | 433 |
""" |
434 |
name = 'db-init' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
435 |
arguments = '<instance>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
436 |
min_args = max_args = 1 |
0 | 437 |
options = ( |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
438 |
('automatic', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
439 |
{'short': 'a', 'action' : 'store_true', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
440 |
'default': False, |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
441 |
'help': 'automatic mode: never ask and use default answer to every ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
442 |
'question.', |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
443 |
}), |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
444 |
('config-level', |
9922
fc02ba8654a7
[serverctl] fix default value for db-init config-level
Julien Cristau <julien.cristau@logilab.fr>
parents:
9303
diff
changeset
|
445 |
{'short': 'l', 'type': 'int', 'default': 0, |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
446 |
'help': 'level threshold for questions asked when configuring ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
447 |
'another source' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
448 |
}), |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
449 |
('drop', |
0 | 450 |
{'short': 'd', 'action': 'store_true', |
451 |
'default': False, |
|
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
452 |
'help': 'insert drop statements to remove previously existant ' |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
453 |
'tables, indexes... (no by default)' |
7030
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
454 |
}), |
0 | 455 |
) |
456 |
||
457 |
def run(self, args): |
|
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
458 |
check_options_consistency(self.config) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
459 |
print('\n'+underline_title('Initializing the system database')) |
0 | 460 |
from cubicweb.server import init_repository |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
461 |
appid = args[0] |
0 | 462 |
config = ServerConfiguration.config_for(appid) |
3954
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
463 |
try: |
9460
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
464 |
system = config.system_source_config |
8669
62213a34726e
[db-api/configuration] simplify db-api and configuration so that all the connection information is in the repository url, closes #2521848
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
8544
diff
changeset
|
465 |
extra_args = system.get('db-extra-arguments') |
4180
9fb0d06926cc
more extra_args cleanup
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
4177
diff
changeset
|
466 |
extra = extra_args and {'extra_args': extra_args} or {} |
3954
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
467 |
get_connection( |
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
468 |
system['db-driver'], database=system['db-name'], |
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
469 |
host=system.get('db-host'), port=system.get('db-port'), |
8434
39c5bb4dcc59
[ldapfeed] do not crash on ldap user deletion + pull + already deactivated users, cleanups (closes #2392933)
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
8376
diff
changeset
|
470 |
user=system.get('db-user') or '', password=system.get('db-password') or '', |
10125
bc6461a7d2da
[server] add a db-namespace option in source definition (closes #1631339)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
10124
diff
changeset
|
471 |
schema=system.get('db-namespace'), **extra) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
472 |
except Exception as ex: |
3954
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
473 |
raise ConfigurationError( |
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
474 |
'You seem to have provided wrong connection information in '\ |
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
475 |
'the %s file. Resolve this first (error: %s).' |
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
476 |
% (config.sources_file(), str(ex).strip())) |
0 | 477 |
init_repository(config, drop=self.config.drop) |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
478 |
if not self.config.automatic: |
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
479 |
while ASK.confirm('Enter another source ?', default_is_yes=False): |
9759
846bc9227394
[serverctl] rename 'add-source' to 'source-add' for consistency's sake (closes #3732169)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
9577
diff
changeset
|
480 |
CWCTL.run(['source-add', '--config-level', |
7140
ba51dac1115d
[c-c create] unification of c-c create and its subcommands handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7121
diff
changeset
|
481 |
str(self.config.config_level), config.appid]) |
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
482 |
|
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
483 |
|
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
484 |
class AddSourceCommand(Command): |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
485 |
"""Add a data source to an instance. |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
486 |
|
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
487 |
<instance> |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
488 |
the identifier of the instance to initialize. |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
489 |
""" |
9759
846bc9227394
[serverctl] rename 'add-source' to 'source-add' for consistency's sake (closes #3732169)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
9577
diff
changeset
|
490 |
name = 'source-add' |
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
491 |
arguments = '<instance>' |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
492 |
min_args = max_args = 1 |
7030
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
493 |
options = ( |
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
494 |
('config-level', |
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
495 |
{'short': 'l', 'type': 'int', 'default': 1, |
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
496 |
'help': 'level threshold for questions asked when configuring another source' |
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
497 |
}), |
d48c6b0158b9
allow configuring the level of the configuration settings for cw-ctl add-source and db-init (which may call add-source)
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6939
diff
changeset
|
498 |
) |
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
499 |
|
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
500 |
def run(self, args): |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
501 |
appid = args[0] |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
502 |
config = ServerConfiguration.config_for(appid) |
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
503 |
repo, cnx = repo_cnx(config) |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
504 |
repo.hm.call_hooks('server_maintenance', repo=repo) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
505 |
try: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
506 |
with cnx: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
507 |
used = set(n for n, in cnx.execute('Any SN WHERE S is CWSource, S name SN')) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
508 |
cubes = repo.get_cubes() |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
509 |
while True: |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
510 |
type = input('source type (%s): ' |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
511 |
% ', '.join(sorted(SOURCE_TYPES))) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
512 |
if type not in SOURCE_TYPES: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
513 |
print('-> unknown source type, use one of the available types.') |
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
514 |
continue |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
515 |
sourcemodule = SOURCE_TYPES[type].module |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
516 |
if not sourcemodule.startswith('cubicweb.'): |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
517 |
# module names look like cubes.mycube.themodule |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
518 |
sourcecube = SOURCE_TYPES[type].module.split('.', 2)[1] |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
519 |
# if the source adapter is coming from an external component, |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
520 |
# ensure it's specified in used cubes |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
521 |
if not sourcecube in cubes: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
522 |
print ('-> this source type require the %s cube which is ' |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
523 |
'not used by the instance.') |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
524 |
continue |
10009
560747cd7774
[serverctl] Ask for parser type when adding a new source (closes #3484231)
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
9984
diff
changeset
|
525 |
break |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
526 |
while True: |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
527 |
parser = input('parser type (%s): ' |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
528 |
% ', '.join(sorted(repo.vreg['parsers']))) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
529 |
if parser in repo.vreg['parsers']: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
530 |
break |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
531 |
print('-> unknown parser identifier, use one of the available types.') |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
532 |
while True: |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
533 |
sourceuri = input('source identifier (a unique name used to ' |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
534 |
'tell sources apart): ').strip() |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
535 |
if not sourceuri: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
536 |
print('-> mandatory.') |
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
537 |
else: |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
538 |
sourceuri = unicode(sourceuri, sys.stdin.encoding) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
539 |
if sourceuri in used: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
540 |
print('-> uri already used, choose another one.') |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
541 |
else: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
542 |
break |
10738
675e47b1b875
[server] import input from six.moves
Julien Cristau <julien.cristau@logilab.fr>
parents:
10662
diff
changeset
|
543 |
url = input('source URL (leave empty for none): ').strip() |
10525
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
544 |
url = unicode(url) if url else None |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
545 |
# XXX configurable inputlevel |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
546 |
sconfig = ask_source_config(config, type, inputlevel=self.config.config_level) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
547 |
cfgstr = unicode(generate_source_config(sconfig), sys.stdin.encoding) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
548 |
cnx.create_entity('CWSource', name=sourceuri, type=unicode(type), |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
549 |
config=cfgstr, parser=unicode(parser), url=unicode(url)) |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
550 |
cnx.commit() |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
551 |
finally: |
b8fddae83a46
[serverctl] call server_{maintenance,shutdown} hooks around add-source
Julien Cristau <julien.cristau@logilab.fr>
parents:
10489
diff
changeset
|
552 |
repo.hm.call_hooks('server_shutdown') |
0 | 553 |
|
554 |
||
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
555 |
class GrantUserOnInstanceCommand(Command): |
0 | 556 |
"""Grant a database user on a repository system database. |
1469 | 557 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
558 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
559 |
the identifier of the instance |
0 | 560 |
<user> |
561 |
the database's user requiring grant access |
|
562 |
""" |
|
563 |
name = 'db-grant-user' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
564 |
arguments = '<instance> <user>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
565 |
min_args = max_args = 2 |
0 | 566 |
options = ( |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
567 |
('set-owner', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
568 |
{'short': 'o', 'type' : 'yn', 'metavar' : '<yes or no>', |
0 | 569 |
'default' : False, |
570 |
'help': 'Set the user as tables owner if yes (no by default).'} |
|
571 |
), |
|
572 |
) |
|
573 |
def run(self, args): |
|
574 |
"""run the command with its specific arguments""" |
|
575 |
from cubicweb.server.sqlutils import sqlexec, sqlgrants |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
576 |
appid, user = args |
0 | 577 |
config = ServerConfiguration.config_for(appid) |
9460
a2a0bc984863
[config] cleanup/refactor server sources file values handling
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9457
diff
changeset
|
578 |
source = config.system_source_config |
0 | 579 |
set_owner = self.config.set_owner |
580 |
cnx = system_source_cnx(source, special_privs='GRANT') |
|
581 |
cursor = cnx.cursor() |
|
582 |
schema = config.load_schema() |
|
583 |
try: |
|
584 |
sqlexec(sqlgrants(schema, source['db-driver'], user, |
|
585 |
set_owner=set_owner), cursor) |
|
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
586 |
except Exception as ex: |
0 | 587 |
cnx.rollback() |
588 |
import traceback |
|
589 |
traceback.print_exc() |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
590 |
print('-> an error occurred:', ex) |
0 | 591 |
else: |
592 |
cnx.commit() |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
593 |
print('-> rights granted to %s on instance %s.' % (appid, user)) |
0 | 594 |
|
3954
56a8b14d68aa
properly fail if user has entered wrong connection information for the system database, closes #549136
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3904
diff
changeset
|
595 |
|
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
596 |
class ResetAdminPasswordCommand(Command): |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
597 |
"""Reset the administrator password. |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
598 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
599 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
600 |
the identifier of the instance |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
601 |
""" |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
602 |
name = 'reset-admin-pwd' |
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
603 |
arguments = '<instance>' |
7669
b96c41c6de4d
[cwctl] set min/max args for reset admin password command. Closes #1832986
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
7595
diff
changeset
|
604 |
min_args = max_args = 1 |
7594
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
605 |
options = ( |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
606 |
('password', |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
607 |
{'short': 'p', 'type' : 'string', 'metavar' : '<new-password>', |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
608 |
'default' : None, |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
609 |
'help': 'Use this password instead of prompt for one.\n' |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
610 |
'/!\ THIS IS AN INSECURE PRACTICE /!\ \n' |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
611 |
'the password will appear in shell history'} |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
612 |
), |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
613 |
) |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
614 |
|
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
615 |
def run(self, args): |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
616 |
"""run the command with its specific arguments""" |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
617 |
from cubicweb.server.utils import crypt_password, manager_userpasswd |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
618 |
appid = args[0] |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
619 |
config = ServerConfiguration.config_for(appid) |
2105
92ea410806fe
refactor sources configuration, add source to sources when using a cube defining
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1980
diff
changeset
|
620 |
sourcescfg = config.read_sources_file() |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
621 |
try: |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
622 |
adminlogin = sourcescfg['admin']['login'] |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
623 |
except KeyError: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
624 |
print('-> Error: could not get cubicweb administrator login.') |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
625 |
sys.exit(1) |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
626 |
cnx = source_cnx(sourcescfg['system']) |
6379
3f67f7ea5632
[R] use dbhelper.binary_value to process passwords and other Bytes fields
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6351
diff
changeset
|
627 |
driver = sourcescfg['system']['db-driver'] |
3f67f7ea5632
[R] use dbhelper.binary_value to process passwords and other Bytes fields
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6351
diff
changeset
|
628 |
dbhelper = get_db_helper(driver) |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
629 |
cursor = cnx.cursor() |
4670
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
630 |
# check admin exists |
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
631 |
cursor.execute("SELECT * FROM cw_CWUser WHERE cw_login=%(l)s", |
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
632 |
{'l': adminlogin}) |
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
633 |
if not cursor.fetchall(): |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
634 |
print("-> error: admin user %r specified in sources doesn't exist " |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
635 |
"in the database" % adminlogin) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
636 |
print(" fix your sources file before running this command") |
4670
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
637 |
cnx.close() |
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
638 |
sys.exit(1) |
7594
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
639 |
if self.config.password is None: |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
640 |
# ask for a new password |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
641 |
msg = 'new password for %s' % adminlogin |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
642 |
_, pwd = manager_userpasswd(adminlogin, confirm=True, passwdmsg=msg) |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
643 |
else: |
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
644 |
pwd = self.config.password |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
645 |
try: |
4670
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
646 |
cursor.execute("UPDATE cw_CWUser SET cw_upassword=%(p)s WHERE cw_login=%(l)s", |
7594
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
647 |
{'p': dbhelper.binary_value(crypt_password(pwd)), 'l': adminlogin}) |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
648 |
sconfig = Configuration(options=USER_OPTIONS) |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
649 |
sconfig['login'] = adminlogin |
7594
d177c0755b10
[cwc shell] add ``--password`` option to ``reset-admin-pwd`` (close #1794866)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7564
diff
changeset
|
650 |
sconfig['password'] = pwd |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
651 |
sourcescfg['admin'] = sconfig |
2105
92ea410806fe
refactor sources configuration, add source to sources when using a cube defining
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1980
diff
changeset
|
652 |
config.write_sources_file(sourcescfg) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
653 |
except Exception as ex: |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
654 |
cnx.rollback() |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
655 |
import traceback |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
656 |
traceback.print_exc() |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
657 |
print('-> an error occurred:', ex) |
1912
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
658 |
else: |
2b9432262240
[server] provide a new reset-admin-pwd command
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1682
diff
changeset
|
659 |
cnx.commit() |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
660 |
print('-> password reset, sources file regenerated.') |
4670
48ba6f820fae
fix #615379 by checking admin user exists instead of making think everything is fine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
661 |
cnx.close() |
0 | 662 |
|
1469 | 663 |
|
0 | 664 |
|
665 |
def _remote_dump(host, appid, output, sudo=False): |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
666 |
# XXX generate unique/portable file name |
2837
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
667 |
from datetime import date |
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
668 |
filename = '%s-%s.tgz' % (appid, date.today().strftime('%Y-%m-%d')) |
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
669 |
dmpcmd = 'cubicweb-ctl db-dump -o /tmp/%s %s' % (filename, appid) |
0 | 670 |
if sudo: |
671 |
dmpcmd = 'sudo %s' % (dmpcmd) |
|
672 |
dmpcmd = 'ssh -t %s "%s"' % (host, dmpcmd) |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
673 |
print(dmpcmd) |
0 | 674 |
if os.system(dmpcmd): |
675 |
raise ExecutionError('Error while dumping the database') |
|
676 |
if output is None: |
|
2837
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
677 |
output = filename |
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
678 |
cmd = 'scp %s:/tmp/%s %s' % (host, filename, output) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
679 |
print(cmd) |
0 | 680 |
if os.system(cmd): |
2837
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
681 |
raise ExecutionError('Error while retrieving the dump at /tmp/%s' % filename) |
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
682 |
rmcmd = 'ssh -t %s "rm -f /tmp/%s"' % (host, filename) |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
683 |
print(rmcmd) |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2507
diff
changeset
|
684 |
if os.system(rmcmd) and not ASK.confirm( |
6109
47d9c0e0f7b7
integrate Celso's work on translation file: proper/complete spanish translation, fixed some typos in french translation, occured -> occurred fix in various places
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6072
diff
changeset
|
685 |
'An error occurred while deleting remote dump at /tmp/%s. ' |
2837
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
686 |
'Continue anyway?' % filename): |
65df5df190a5
B [cwctl] fix db-{dump,copy,restore} commands
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2711
diff
changeset
|
687 |
raise ExecutionError('Error while deleting remote dump at /tmp/%s' % filename) |
0 | 688 |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
689 |
|
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
690 |
def _local_dump(appid, output, format='native'): |
0 | 691 |
config = ServerConfiguration.config_for(appid) |
5043
fe52dd3936cf
[repo config] cleanup read_instance_schema / bootstrap_schema / creating mess
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5033
diff
changeset
|
692 |
config.quick_start = True |
fe52dd3936cf
[repo config] cleanup read_instance_schema / bootstrap_schema / creating mess
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5033
diff
changeset
|
693 |
mih = config.migration_handler(connect=False, verbosity=1) |
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
694 |
mih.backup_database(output, askconfirm=False, format=format) |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
695 |
mih.shutdown() |
0 | 696 |
|
9457
d5ed6efd6448
[c-c restore] drop useless restore-all option, and related systemonly argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9303
diff
changeset
|
697 |
def _local_restore(appid, backupfile, drop, format='native'): |
0 | 698 |
config = ServerConfiguration.config_for(appid) |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
699 |
config.verbosity = 1 # else we won't be asked for confirmation on problems |
5043
fe52dd3936cf
[repo config] cleanup read_instance_schema / bootstrap_schema / creating mess
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5033
diff
changeset
|
700 |
config.quick_start = True |
fe52dd3936cf
[repo config] cleanup read_instance_schema / bootstrap_schema / creating mess
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5033
diff
changeset
|
701 |
mih = config.migration_handler(connect=False, verbosity=1) |
9457
d5ed6efd6448
[c-c restore] drop useless restore-all option, and related systemonly argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9303
diff
changeset
|
702 |
mih.restore_database(backupfile, drop, askconfirm=False, format=format) |
10569
af47954c1015
[migration] remove repo_connect and use config.repository() instead
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
10527
diff
changeset
|
703 |
repo = mih.repo |
0 | 704 |
# version of the database |
705 |
dbversions = repo.get_versions() |
|
706 |
mih.shutdown() |
|
707 |
if not dbversions: |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
708 |
print("bad or missing version information in the database, don't upgrade file system") |
0 | 709 |
return |
710 |
# version of installed software |
|
711 |
eversion = dbversions['cubicweb'] |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
712 |
status = instance_status(config, eversion, dbversions) |
0 | 713 |
# * database version > installed software |
714 |
if status == 'needsoftupgrade': |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
715 |
print("** The database of %s is more recent than the installed software!" % config.appid) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
716 |
print("** Upgrade your software, then migrate the database by running the command") |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
717 |
print("** 'cubicweb-ctl upgrade %s'" % config.appid) |
0 | 718 |
return |
719 |
# * database version < installed software, an upgrade will be necessary |
|
720 |
# anyway, just rewrite vc.conf and warn user he has to upgrade |
|
2851
d3b80a4faf3f
F [cwctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2837
diff
changeset
|
721 |
elif status == 'needapplupgrade': |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
722 |
print("** The database of %s is older than the installed software." % config.appid) |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
723 |
print("** Migrate the database by running the command") |
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
724 |
print("** 'cubicweb-ctl upgrade %s'" % config.appid) |
0 | 725 |
return |
726 |
# * database version = installed software, database version = instance fs version |
|
727 |
# ok! |
|
728 |
||
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
729 |
def instance_status(config, cubicwebapplversion, vcconf): |
0 | 730 |
cubicwebversion = config.cubicweb_version() |
731 |
if cubicwebapplversion > cubicwebversion: |
|
732 |
return 'needsoftupgrade' |
|
733 |
if cubicwebapplversion < cubicwebversion: |
|
734 |
return 'needapplupgrade' |
|
735 |
for cube in config.cubes(): |
|
736 |
try: |
|
737 |
softversion = config.cube_version(cube) |
|
738 |
except ConfigurationError: |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
739 |
print('-> Error: no cube version information for %s, please check that the cube is installed.' % cube) |
0 | 740 |
continue |
741 |
try: |
|
742 |
applversion = vcconf[cube] |
|
743 |
except KeyError: |
|
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
744 |
print('-> Error: no cube version information for %s in version configuration.' % cube) |
1469 | 745 |
continue |
0 | 746 |
if softversion == applversion: |
747 |
continue |
|
748 |
if softversion > applversion: |
|
749 |
return 'needsoftupgrade' |
|
750 |
elif softversion < applversion: |
|
751 |
return 'needapplupgrade' |
|
752 |
return None |
|
1469 | 753 |
|
0 | 754 |
|
755 |
class DBDumpCommand(Command): |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
756 |
"""Backup the system database of an instance. |
1469 | 757 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
758 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
759 |
the identifier of the instance to backup |
0 | 760 |
format [[user@]host:]appname |
761 |
""" |
|
762 |
name = 'db-dump' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
763 |
arguments = '<instance>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
764 |
min_args = max_args = 1 |
0 | 765 |
options = ( |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
766 |
('output', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
767 |
{'short': 'o', 'type' : 'string', 'metavar' : '<file>', |
0 | 768 |
'default' : None, |
769 |
'help': 'Specify the backup file where the backup will be stored.'} |
|
770 |
), |
|
771 |
('sudo', |
|
772 |
{'short': 's', 'action' : 'store_true', |
|
773 |
'default' : False, |
|
774 |
'help': 'Use sudo on the remote host.'} |
|
775 |
), |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
776 |
('format', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
777 |
{'short': 'f', 'default': 'native', 'type': 'choice', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
778 |
'choices': ('native', 'portable'), |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
779 |
'help': '"native" format uses db backend utilities to dump the database. ' |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
780 |
'"portable" format uses a database independent format'} |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
781 |
), |
0 | 782 |
) |
783 |
||
784 |
def run(self, args): |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
785 |
appid = args[0] |
0 | 786 |
if ':' in appid: |
787 |
host, appid = appid.split(':') |
|
788 |
_remote_dump(host, appid, self.config.output, self.config.sudo) |
|
789 |
else: |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
790 |
_local_dump(appid, self.config.output, format=self.config.format) |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
791 |
|
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
792 |
|
0 | 793 |
|
794 |
||
795 |
class DBRestoreCommand(Command): |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
796 |
"""Restore the system database of an instance. |
1469 | 797 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
798 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
799 |
the identifier of the instance to restore |
0 | 800 |
""" |
801 |
name = 'db-restore' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
802 |
arguments = '<instance> <backupfile>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
803 |
min_args = max_args = 2 |
0 | 804 |
|
805 |
options = ( |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
806 |
('no-drop', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
807 |
{'short': 'n', 'action' : 'store_true', 'default' : False, |
0 | 808 |
'help': 'for some reason the database doesn\'t exist and so ' |
809 |
'should not be dropped.'} |
|
810 |
), |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
811 |
('format', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
812 |
{'short': 'f', 'default': 'native', 'type': 'choice', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
813 |
'choices': ('native', 'portable'), |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
814 |
'help': 'the format used when dumping the database'}), |
0 | 815 |
) |
816 |
||
817 |
def run(self, args): |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
818 |
appid, backupfile = args |
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
819 |
if self.config.format == 'portable': |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
820 |
# we need to ensure a DB exist before restoring from portable format |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
821 |
if not self.config.no_drop: |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
822 |
try: |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
823 |
CWCTL.run(['db-create', '--automatic', appid]) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
824 |
except SystemExit as exc: |
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
825 |
# continue if the command exited with status 0 (success) |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
826 |
if exc.code: |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
827 |
raise |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
828 |
_local_restore(appid, backupfile, |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
829 |
drop=not self.config.no_drop, |
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
830 |
format=self.config.format) |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
831 |
if self.config.format == 'portable': |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
832 |
try: |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
833 |
CWCTL.run(['db-rebuild-fti', appid]) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8669
diff
changeset
|
834 |
except SystemExit as exc: |
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
835 |
if exc.code: |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
836 |
raise |
0 | 837 |
|
838 |
||
839 |
class DBCopyCommand(Command): |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
840 |
"""Copy the system database of an instance (backup and restore). |
1469 | 841 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
842 |
<src-instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
843 |
the identifier of the instance to backup |
0 | 844 |
format [[user@]host:]appname |
845 |
||
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
846 |
<dest-instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
847 |
the identifier of the instance to restore |
0 | 848 |
""" |
849 |
name = 'db-copy' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
850 |
arguments = '<src-instance> <dest-instance>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
851 |
min_args = max_args = 2 |
0 | 852 |
options = ( |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
853 |
('no-drop', |
1469 | 854 |
{'short': 'n', 'action' : 'store_true', |
0 | 855 |
'default' : False, |
856 |
'help': 'For some reason the database doesn\'t exist and so ' |
|
857 |
'should not be dropped.'} |
|
858 |
), |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
859 |
('keep-dump', |
0 | 860 |
{'short': 'k', 'action' : 'store_true', |
861 |
'default' : False, |
|
862 |
'help': 'Specify that the dump file should not be automatically removed.'} |
|
863 |
), |
|
864 |
('sudo', |
|
865 |
{'short': 's', 'action' : 'store_true', |
|
866 |
'default' : False, |
|
867 |
'help': 'Use sudo on the remote host.'} |
|
868 |
), |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
869 |
('format', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
870 |
{'short': 'f', 'default': 'native', 'type': 'choice', |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
871 |
'choices': ('native', 'portable'), |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
872 |
'help': '"native" format uses db backend utilities to dump the database. ' |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
873 |
'"portable" format uses a database independent format'} |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
874 |
), |
0 | 875 |
) |
876 |
||
877 |
def run(self, args): |
|
878 |
import tempfile |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
879 |
srcappid, destappid = args |
3148 | 880 |
fd, output = tempfile.mkstemp() |
881 |
os.close(fd) |
|
0 | 882 |
if ':' in srcappid: |
883 |
host, srcappid = srcappid.split(':') |
|
884 |
_remote_dump(host, srcappid, output, self.config.sudo) |
|
885 |
else: |
|
7342
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
886 |
_local_dump(srcappid, output, format=self.config.format) |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
887 |
_local_restore(destappid, output, not self.config.no_drop, |
d1c8b5b3531c
adds support for a portable db import/export format (closes: #1521112)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7155
diff
changeset
|
888 |
self.config.format) |
0 | 889 |
if self.config.keep_dump: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
890 |
print('-> you can get the dump file at', output) |
0 | 891 |
else: |
892 |
os.remove(output) |
|
893 |
||
1469 | 894 |
|
0 | 895 |
class CheckRepositoryCommand(Command): |
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
896 |
"""Check integrity of the system database of an instance. |
1469 | 897 |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
898 |
<instance> |
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
899 |
the identifier of the instance to check |
0 | 900 |
""" |
901 |
name = 'db-check' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
902 |
arguments = '<instance>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
903 |
min_args = max_args = 1 |
0 | 904 |
options = ( |
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
905 |
('checks', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
906 |
{'short': 'c', 'type' : 'csv', 'metavar' : '<check list>', |
7036
63386b35ec69
[c-c db-check] new checks for entities missing a mandatory relation/attribute
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7030
diff
changeset
|
907 |
'default' : ('entities', 'relations', |
63386b35ec69
[c-c db-check] new checks for entities missing a mandatory relation/attribute
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7030
diff
changeset
|
908 |
'mandatory_relations', 'mandatory_attributes', |
63386b35ec69
[c-c db-check] new checks for entities missing a mandatory relation/attribute
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7030
diff
changeset
|
909 |
'metadata', 'schema', 'text_index'), |
0 | 910 |
'help': 'Comma separated list of check to run. By default run all \ |
7036
63386b35ec69
[c-c db-check] new checks for entities missing a mandatory relation/attribute
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7030
diff
changeset
|
911 |
checks, i.e. entities, relations, mandatory_relations, mandatory_attributes, \ |
63386b35ec69
[c-c db-check] new checks for entities missing a mandatory relation/attribute
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7030
diff
changeset
|
912 |
metadata, text_index and schema.'} |
0 | 913 |
), |
1469 | 914 |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
915 |
('autofix', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
916 |
{'short': 'a', 'type' : 'yn', 'metavar' : '<yes or no>', |
0 | 917 |
'default' : False, |
918 |
'help': 'Automatically correct integrity problems if this option \ |
|
919 |
is set to "y" or "yes", else only display them'} |
|
920 |
), |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
921 |
('reindex', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
922 |
{'short': 'r', 'type' : 'yn', 'metavar' : '<yes or no>', |
0 | 923 |
'default' : False, |
924 |
'help': 're-indexes the database for full text search if this \ |
|
925 |
option is set to "y" or "yes" (may be long for large database).'} |
|
926 |
), |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
927 |
('force', |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2476
diff
changeset
|
928 |
{'short': 'f', 'action' : 'store_true', |
2473
490f88fb99b6
new distinguish repairing/creating from regular start.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2461
diff
changeset
|
929 |
'default' : False, |
490f88fb99b6
new distinguish repairing/creating from regular start.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2461
diff
changeset
|
930 |
'help': 'don\'t check instance is up to date.'} |
490f88fb99b6
new distinguish repairing/creating from regular start.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2461
diff
changeset
|
931 |
), |
1469 | 932 |
|
0 | 933 |
) |
934 |
||
935 |
def run(self, args): |
|
6184
da580218a5b3
[c-c db-check] add missing import
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
936 |
from cubicweb.server.checkintegrity import check |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
937 |
appid = args[0] |
0 | 938 |
config = ServerConfiguration.config_for(appid) |
2473
490f88fb99b6
new distinguish repairing/creating from regular start.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2461
diff
changeset
|
939 |
config.repairing = self.config.force |
9797
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
940 |
repo, _cnx = repo_cnx(config) |
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
941 |
with repo.internal_cnx() as cnx: |
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
942 |
check(repo, cnx, |
9797
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
943 |
self.config.checks, |
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
944 |
self.config.reindex, |
4e640ab62f51
[tests/checkintegrity] use the new connection api
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9759
diff
changeset
|
945 |
self.config.autofix) |
0 | 946 |
|
947 |
||
948 |
class RebuildFTICommand(Command): |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
949 |
"""Rebuild the full-text index of the system database of an instance. |
1469 | 950 |
|
8449
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
951 |
<instance> [etype(s)] |
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
952 |
the identifier of the instance to rebuild |
8449
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
953 |
|
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
954 |
If no etype is specified, cubicweb will reindex everything, otherwise |
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
955 |
only specified etypes will be considered. |
0 | 956 |
""" |
957 |
name = 'db-rebuild-fti' |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2473
diff
changeset
|
958 |
arguments = '<instance>' |
8449
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
959 |
min_args = 1 |
0 | 960 |
|
961 |
def run(self, args): |
|
962 |
from cubicweb.server.checkintegrity import reindex_entities |
|
8449
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
963 |
appid = args.pop(0) |
cc83a3f16c0f
[fti] make db-rebuild-fti accept etypes on command line (closes #2410508)
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
8434
diff
changeset
|
964 |
etypes = args or None |
0 | 965 |
config = ServerConfiguration.config_for(appid) |
966 |
repo, cnx = repo_cnx(config) |
|
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
967 |
with cnx: |
10354
635cfac73d28
[repoapi] fold ClientConnection into Connection
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
10237
diff
changeset
|
968 |
reindex_entities(repo.schema, cnx, etypes=etypes) |
9577
c52441e4a3d7
[serverctl] use repoapi for db-check, add-source, rebuild-fti commands
Julien Cristau <julien.cristau@logilab.fr>
parents:
9485
diff
changeset
|
969 |
cnx.commit() |
0 | 970 |
|
971 |
||
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
972 |
class SynchronizeSourceCommand(Command): |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
973 |
"""Force a source synchronization. |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
974 |
|
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
975 |
<instance> |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
976 |
the identifier of the instance |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
977 |
<source> |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
978 |
the name of the source to synchronize. |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
979 |
""" |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
980 |
name = 'source-sync' |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
981 |
arguments = '<instance> <source>' |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
982 |
min_args = max_args = 2 |
10400
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
983 |
options = ( |
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
984 |
('loglevel', |
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
985 |
{'short': 'l', 'type' : 'choice', 'metavar': '<log level>', |
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
986 |
'default': 'info', 'choices': ('debug', 'info', 'warning', 'error'), |
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
987 |
}), |
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
988 |
) |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
989 |
|
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
990 |
def run(self, args): |
10489
8a2e2efe9362
[serverctl] fix source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10411
diff
changeset
|
991 |
from cubicweb import repoapi |
10400
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
992 |
from cubicweb.cwctl import init_cmdline_log_threshold |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
993 |
config = ServerConfiguration.config_for(args[0]) |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
994 |
config.global_set_option('log-file', None) |
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
995 |
config.log_format = '%(levelname)s %(name)s: %(message)s' |
10400
383a5e629145
[serverctl] allow changing the log level for source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10125
diff
changeset
|
996 |
init_cmdline_log_threshold(config, self['loglevel']) |
10489
8a2e2efe9362
[serverctl] fix source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10411
diff
changeset
|
997 |
repo = repoapi.get_repository(config=config) |
10526
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
998 |
repo.hm.call_hooks('server_maintenance', repo=repo) |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
999 |
try: |
10526
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1000 |
try: |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1001 |
source = repo.sources_by_uri[args[1]] |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1002 |
except KeyError: |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1003 |
raise ExecutionError('no source named %r' % args[1]) |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1004 |
with repo.internal_cnx() as cnx: |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1005 |
stats = source.pull_data(cnx, force=True, raise_on_error=True) |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1006 |
finally: |
459d6f24754b
[serverct] call server_{maintenance,shutdown} hooks around source-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10525
diff
changeset
|
1007 |
repo.shutdown() |
10662
10942ed172de
[py3k] dict.iteritems → dict.items
Rémi Cardona <remi.cardona@logilab.fr>
parents:
10612
diff
changeset
|
1008 |
for key, val in stats.items(): |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
1009 |
if val: |
10589
7c23b7de2b8d
[py3k] print function
Samuel Trégouët <samuel.tregouet@logilab.fr>
parents:
10569
diff
changeset
|
1010 |
print(key, ':', val) |
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
1011 |
|
9303
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1012 |
|
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1013 |
|
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1014 |
def permissionshandler(relation, perms): |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1015 |
from yams.schema import RelationDefinitionSchema |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1016 |
from yams.buildobjs import DEFAULT_ATTRPERMS |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1017 |
from cubicweb.schema import (PUB_SYSTEM_ENTITY_PERMS, PUB_SYSTEM_REL_PERMS, |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1018 |
PUB_SYSTEM_ATTR_PERMS, RO_REL_PERMS, RO_ATTR_PERMS) |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1019 |
defaultrelperms = (DEFAULT_ATTRPERMS, PUB_SYSTEM_REL_PERMS, |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1020 |
PUB_SYSTEM_ATTR_PERMS, RO_REL_PERMS, RO_ATTR_PERMS) |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1021 |
defaulteperms = (PUB_SYSTEM_ENTITY_PERMS,) |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1022 |
# canonicalize vs str/unicode |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1023 |
for p in ('read', 'add', 'update', 'delete'): |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1024 |
rule = perms.get(p) |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1025 |
if rule: |
10612
84468b90e9c1
[py3k] basestring → six.string_types
Rémi Cardona <remi.cardona@logilab.fr>
parents:
10589
diff
changeset
|
1026 |
perms[p] = tuple(str(x) if isinstance(x, string_types) else x |
9303
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1027 |
for x in rule) |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1028 |
return perms, perms in defaultrelperms or perms in defaulteperms |
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1029 |
|
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1030 |
|
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1031 |
class SchemaDiffCommand(Command): |
8984
0f2fad7a92d4
[cw-ctl] fix help message for schemadiff In global help (closes #2888538)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8924
diff
changeset
|
1032 |
"""Generate a diff between schema and fsschema description. |
0f2fad7a92d4
[cw-ctl] fix help message for schemadiff In global help (closes #2888538)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8924
diff
changeset
|
1033 |
|
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1034 |
<instance> |
8984
0f2fad7a92d4
[cw-ctl] fix help message for schemadiff In global help (closes #2888538)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8924
diff
changeset
|
1035 |
the identifier of the instance |
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1036 |
<diff-tool> |
8984
0f2fad7a92d4
[cw-ctl] fix help message for schemadiff In global help (closes #2888538)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8924
diff
changeset
|
1037 |
the name of the diff tool to compare the two generated files. |
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1038 |
""" |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1039 |
name = 'schema-diff' |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1040 |
arguments = '<instance> <diff-tool>' |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1041 |
min_args = max_args = 2 |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1042 |
|
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1043 |
def run(self, args): |
8924
8666438778c7
[c-c serverctl] import locally to speed up c-c
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
8749
diff
changeset
|
1044 |
from yams.diff import schema_diff |
10527
2379f136d48c
[serverctl] fix schema-diff command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10526
diff
changeset
|
1045 |
from cubicweb import repoapi |
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1046 |
appid = args.pop(0) |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1047 |
diff_tool = args.pop(0) |
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1048 |
config = ServerConfiguration.config_for(appid) |
10527
2379f136d48c
[serverctl] fix schema-diff command
Julien Cristau <julien.cristau@logilab.fr>
parents:
10526
diff
changeset
|
1049 |
repo = repoapi.get_repository(config=config) |
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1050 |
fsschema = config.load_schema(expand_cubes=True) |
9303
e84414be8506
[serverctl] complete the schema-diff command with options that will fix & enhance it.
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
9002
diff
changeset
|
1051 |
schema_diff(fsschema, repo.schema, permissionshandler, diff_tool, ignore=('eid',)) |
8749
9db7580d6427
add a command to compare db schema and file system schema (closes #464991)
Alexandre Richardson <alexandre.richardson@logilab.fr>
parents:
8695
diff
changeset
|
1052 |
|
7457
f7c97a3cd121
[datafeed] provide a source-sync command to launch source synchronization through the command line. Closes #1725692
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7398
diff
changeset
|
1053 |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
1054 |
for cmdclass in (CreateInstanceDBCommand, InitInstanceCommand, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
1055 |
GrantUserOnInstanceCommand, ResetAdminPasswordCommand, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
1056 |
DBDumpCommand, DBRestoreCommand, DBCopyCommand, |
6427
c8a5ac2d1eaa
[schema / sources] store data sources as cubicweb entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6379
diff
changeset
|
1057 |
AddSourceCommand, CheckRepositoryCommand, RebuildFTICommand, |
9485
2b47e800cea6
[serverctl] remove broken schema-sync command
Julien Cristau <julien.cristau@logilab.fr>
parents:
9460
diff
changeset
|
1058 |
SynchronizeSourceCommand, SchemaDiffCommand, |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
1059 |
): |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6132
diff
changeset
|
1060 |
CWCTL.register(cmdclass) |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1061 |
|
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1062 |
# extend configure command to set options in sources config file ############### |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1063 |
|
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1064 |
db_options = ( |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1065 |
('db', |
10077
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1066 |
{'short': 'd', 'type' : 'named', 'metavar' : '[section1.]key1:value1,[section2.]key2:value2', |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1067 |
'default': None, |
10077
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1068 |
'help': '''set <key> in <section> to <value> in "source" configuration file. If <section> is not specified, it defaults to "system". |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1069 |
|
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1070 |
Beware that changing admin.login or admin.password using this command |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1071 |
will NOT update the database with new admin credentials. Use the |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1072 |
reset-admin-pwd command instead. |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1073 |
''', |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1074 |
}), |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1075 |
) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1076 |
|
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1077 |
ConfigureInstanceCommand.options = merge_options( |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1078 |
ConfigureInstanceCommand.options + db_options) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1079 |
|
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1080 |
configure_instance = ConfigureInstanceCommand.configure_instance |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1081 |
def configure_instance2(self, appid): |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1082 |
configure_instance(self, appid) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1083 |
if self.config.db is not None: |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1084 |
appcfg = ServerConfiguration.config_for(appid) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1085 |
srccfg = appcfg.read_sources_file() |
10662
10942ed172de
[py3k] dict.iteritems → dict.items
Rémi Cardona <remi.cardona@logilab.fr>
parents:
10612
diff
changeset
|
1086 |
for key, value in self.config.db.items(): |
10077
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1087 |
if '.' in key: |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1088 |
section, key = key.split('.', 1) |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1089 |
else: |
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1090 |
section = 'system' |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1091 |
try: |
10077
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1092 |
srccfg[section][key] = value |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1093 |
except KeyError: |
10077
1a28c0b0a0b4
[c-c configure] make it possible to specify the section for sources configuration (closes #3477678)
David Douard <david.douard@logilab.fr>
parents:
10010
diff
changeset
|
1094 |
raise ConfigurationError('unknown configuration key "%s" in section "%s" for source' % (key, section)) |
9002
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1095 |
admcfg = Configuration(options=USER_OPTIONS) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1096 |
admcfg['login'] = srccfg['admin']['login'] |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1097 |
admcfg['password'] = srccfg['admin']['password'] |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1098 |
srccfg['admin'] = admcfg |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1099 |
appcfg.write_sources_file(srccfg) |
f98d1c46ed9f
[cwctl] add configure command to cw-ctl (closes #2709702)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8984
diff
changeset
|
1100 |
ConfigureInstanceCommand.configure_instance = configure_instance2 |