kopia lustrzana https://github.com/c9/core
Revert "Revert "Fix, help debug workspace creation issues""
rodzic
40cc1c7d06
commit
e47b3120a5
|
@ -44,7 +44,11 @@ function RestClient(host, port, config) {
|
||||||
port: port,
|
port: port,
|
||||||
path: path,
|
path: path,
|
||||||
method: method,
|
method: method,
|
||||||
headers: headers
|
headers: headers,
|
||||||
|
timeout: config.timeout || 60 * 1000,
|
||||||
|
pool: config.pool || {
|
||||||
|
maxSockets: 100000,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
if (config.username)
|
if (config.username)
|
||||||
options.auth = config.username + ":" + config.password;
|
options.auth = config.username + ":" + config.password;
|
||||||
|
|
|
@ -42,6 +42,8 @@ define(function(require, module, exports) {
|
||||||
.replace(/\n/g, "<br />")
|
.replace(/\n/g, "<br />")
|
||||||
.replace(/(https?:\/\/[^\s]*\b)/g, "<a href='$1' target='_blank'>$1</a>");
|
.replace(/(https?:\/\/[^\s]*\b)/g, "<a href='$1' target='_blank'>$1</a>");
|
||||||
|
|
||||||
|
plugin.getElement("ok").setCaption(options.yes || "OK");
|
||||||
|
|
||||||
plugin.update([
|
plugin.update([
|
||||||
{ id: "dontshow", visible: options && options.showDontShow }
|
{ id: "dontshow", visible: options && options.showDontShow }
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -225,6 +225,10 @@ define(function(require, exports, module) {
|
||||||
callback(fatalError(res.error.message, "dashboard"));
|
callback(fatalError(res.error.message, "dashboard"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (err.code == 404) {
|
||||||
|
callback(fatalError("This workspace no longer appears to exist or failed to be created.", "dashboard"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
else if (err.code === 428 && res.error) {
|
else if (err.code === 428 && res.error) {
|
||||||
emit("restore", {
|
emit("restore", {
|
||||||
projectState: res.error.projectState,
|
projectState: res.error.projectState,
|
||||||
|
|
|
@ -253,7 +253,7 @@ define(function(require, exports, module) {
|
||||||
err.message = "SSH permission denied. Please review your workspace configuration.";
|
err.message = "SSH permission denied. Please review your workspace configuration.";
|
||||||
return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() {
|
return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() {
|
||||||
window.location = dashboardUrl;
|
window.location = dashboardUrl;
|
||||||
});
|
}, { yes: "Return to dashboard" });
|
||||||
case "reload":
|
case "reload":
|
||||||
lastError = showError(err.message + ". Please reload this window.", -1);
|
lastError = showError(err.message + ". Please reload this window.", -1);
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
|
Ładowanie…
Reference in New Issue