|
19 | 19 | if log_debug.casefold() not in ('no', 'false'):
|
20 | 20 | handler = logging.StreamHandler(sys.stderr)
|
21 | 21 | handler.setLevel(logging.DEBUG)
|
22 |
| - formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") |
| 22 | + formatter = logging.Formatter("[D %(asctime)s %(name)s] %(message)s") |
23 | 23 | handler.setFormatter(formatter)
|
24 | 24 | logger.addHandler(handler)
|
25 | 25 |
|
@@ -92,14 +92,6 @@ def _get_urlprefix():
|
92 | 92 | url_prefix = os.environ.get('JUPYTERHUB_SERVICE_PREFIX')
|
93 | 93 | return url_prefix
|
94 | 94 |
|
95 |
| - # return url parameters |
96 |
| - def _get_urlparams(): |
97 |
| - global _openvscodeserver_token |
98 |
| - url_params = '?' + '&'.join([ |
99 |
| - 'tkn=' + _openvscodeserver_token, |
100 |
| - ]) |
101 |
| - return url_params |
102 |
| - |
103 | 95 | # return command
|
104 | 96 | def _get_cmd(port, unix_socket):
|
105 | 97 |
|
@@ -129,7 +121,7 @@ def _get_cmd(port, unix_socket):
|
129 | 121 | if supported_args['version']:
|
130 | 122 | if not _is_version_supported(1, 97):
|
131 | 123 | raise NotImplementedError(
|
132 |
| - 'OpenVSCode-Server is not installed in the required version of >= 1.98' |
| 124 | + 'OpenVSCode-Server is not installed in the required version of >= 1.97' |
133 | 125 | )
|
134 | 126 | else:
|
135 | 127 | raise NotImplementedError(
|
@@ -197,7 +189,16 @@ def _get_iconpath():
|
197 | 189 |
|
198 | 190 | # return path info = launchers url file including url parameters
|
199 | 191 | def _get_pathinfo():
|
200 |
| - path_info = 'openvscodeserver' + _get_urlparams() |
| 192 | + global _openvscodeserver_token |
| 193 | + params = ['tkn=' + _openvscodeserver_token] |
| 194 | + |
| 195 | + default_folder = os.getenv('JUPYTER_OPENVSCODE_PROXY_DEFAULT_FOLDER', None) |
| 196 | + if default_folder is not None: |
| 197 | + params.append(f'folder={default_folder}') |
| 198 | + |
| 199 | + url_params = '?' + '&'.join(params) |
| 200 | + |
| 201 | + path_info = 'openvscodeserver' + url_params |
201 | 202 | return path_info
|
202 | 203 |
|
203 | 204 | # create random token
|
|
0 commit comments