|
|
@ -36,8 +36,23 @@ var conf = function () {
|
|
|
|
} else if ((typeof value === "string") && value.indexOf("%server.ip%") > -1) {
|
|
|
|
} else if ((typeof value === "string") && value.indexOf("%server.ip%") > -1) {
|
|
|
|
var getProperty = require("process").getProperty;
|
|
|
|
var getProperty = require("process").getProperty;
|
|
|
|
return value.replace("%server.ip%", getProperty("carbon.local.ip"));
|
|
|
|
return value.replace("%server.ip%", getProperty("carbon.local.ip"));
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
var paramPattern = new RegExp("%(.*?)%", "g");
|
|
|
|
|
|
|
|
var out = value;
|
|
|
|
|
|
|
|
while ((matches = paramPattern.exec(value)) !== null) {
|
|
|
|
|
|
|
|
// This is necessary to avoid infinite loops with zero-width matches
|
|
|
|
|
|
|
|
if (matches.index === paramPattern.lastIndex) {
|
|
|
|
|
|
|
|
paramPattern.lastIndex++;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (matches.length == 2) {
|
|
|
|
|
|
|
|
var property = process.getProperty(matches[1]);
|
|
|
|
|
|
|
|
if (property) {
|
|
|
|
|
|
|
|
out = out.replace(new RegExp("%" + matches[1] + "%", "g"), property);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return value;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
);
|
|
|
|
application.put("CONF", conf);
|
|
|
|
application.put("CONF", conf);
|
|
|
|