@andersbakken/fisk 4.0.7 → 4.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/builder/fisk-builder.js +6 -8
  2. package/daemon/fisk-daemon.js +3 -7
  3. package/monitor/fisk-monitor.js +3 -7
  4. package/package.json +1 -1
  5. package/scheduler/fisk-scheduler.js +3 -8
package/builder/fisk-builder.js CHANGED
@@ -54820,15 +54820,12 @@ class Options {
54820
54820
 
54821
54821
  value(name) {
54822
54822
  // foo-bar becomes FOO_BAR as env
54823
- // console.log("motherfuck value", name, this.argv);
54824
- if (name in this.argv) {
54823
+ if (name in this.argv)
54825
54824
  return this.argv[name];
54826
- }
54827
54825
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
54828
54826
  if (envname in process.env)
54829
54827
  return realValue(process.env[envname]);
54830
54828
 
54831
- // console.log(name, this.options);
54832
54829
  if (name in this.options)
54833
54830
  return this.options[name];
54834
54831
  return undefined;
@@ -54861,13 +54858,12 @@ class Options {
54861
54858
  const Success = 1;
54862
54859
  const Seen = 2;
54863
54860
  const read = file => {
54864
- console.log("trying fucking file", file, seen);
54865
54861
  if (seen.has(file))
54866
54862
  return Seen;
54867
54863
  seen.add(file);
54868
54864
  try {
54869
54865
  const contents = fs.readFileSync(file, "utf8");
54870
- console.log(`Loaded ${contents} bytes from ${file}`);
54866
+ this._log(`Loaded ${contents.length} bytes from ${file}`);
54871
54867
 
54872
54868
  if (contents) {
54873
54869
  data.push({ file: file, contents: contents });
@@ -54879,7 +54875,7 @@ class Options {
54879
54875
  return Failed;
54880
54876
  };
54881
54877
 
54882
- console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
54878
+ // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
54883
54879
  if (path.isAbsolute(file)) {
54884
54880
  read(file);
54885
54881
  } else {
@@ -55108,7 +55104,9 @@ function getFromCache(job, cb) {
55108
55104
  const environments = {};
55109
55105
  const client = new Client(option, common.Version);
55110
55106
  client.on("objectCache", (enabled) => {
55111
- const objectCacheSize = bytesExports.parse(Number(option("object-cache-size")));
55107
+ const size = option("object-cache-size");
55108
+ const objectCacheSize = typeof size === "number" ? size : bytesExports.parse(String(size));
55109
+ console.log("got object cache", enabled, objectCacheSize, option("object-cache-size"));
55112
55110
  if (enabled && objectCacheSize) {
55113
55111
  const objectCacheDir = stringOrUndefined(option("object-cache-dir")) || path__default["default"].join(common.cacheDir(), "objectcache");
55114
55112
  objectCache = new ObjectCache(objectCacheDir, objectCacheSize, option.int("object-cache-purge-size") || objectCacheSize);
package/daemon/fisk-daemon.js CHANGED
@@ -519,15 +519,12 @@ class Options {
519
519
 
520
520
  value(name) {
521
521
  // foo-bar becomes FOO_BAR as env
522
- // console.log("motherfuck value", name, this.argv);
523
- if (name in this.argv) {
522
+ if (name in this.argv)
524
523
  return this.argv[name];
525
- }
526
524
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
527
525
  if (envname in process.env)
528
526
  return realValue(process.env[envname]);
529
527
 
530
- // console.log(name, this.options);
531
528
  if (name in this.options)
532
529
  return this.options[name];
533
530
  return undefined;
@@ -560,13 +557,12 @@ class Options {
560
557
  const Success = 1;
561
558
  const Seen = 2;
562
559
  const read = file => {
563
- console.log("trying fucking file", file, seen);
564
560
  if (seen.has(file))
565
561
  return Seen;
566
562
  seen.add(file);
567
563
  try {
568
564
  const contents = fs$k.readFileSync(file, "utf8");
569
- console.log(`Loaded ${contents} bytes from ${file}`);
565
+ this._log(`Loaded ${contents.length} bytes from ${file}`);
570
566
 
571
567
  if (contents) {
572
568
  data.push({ file: file, contents: contents });
@@ -578,7 +574,7 @@ class Options {
578
574
  return Failed;
579
575
  };
580
576
 
581
- console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
577
+ // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
582
578
  if (path$h.isAbsolute(file)) {
583
579
  read(file);
584
580
  } else {
package/monitor/fisk-monitor.js CHANGED
@@ -5322,15 +5322,12 @@ class Options {
5322
5322
 
5323
5323
  value(name) {
5324
5324
  // foo-bar becomes FOO_BAR as env
5325
- // console.log("motherfuck value", name, this.argv);
5326
- if (name in this.argv) {
5325
+ if (name in this.argv)
5327
5326
  return this.argv[name];
5328
- }
5329
5327
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
5330
5328
  if (envname in process.env)
5331
5329
  return realValue(process.env[envname]);
5332
5330
 
5333
- // console.log(name, this.options);
5334
5331
  if (name in this.options)
5335
5332
  return this.options[name];
5336
5333
  return undefined;
@@ -5363,13 +5360,12 @@ class Options {
5363
5360
  const Success = 1;
5364
5361
  const Seen = 2;
5365
5362
  const read = file => {
5366
- console.log("trying fucking file", file, seen);
5367
5363
  if (seen.has(file))
5368
5364
  return Seen;
5369
5365
  seen.add(file);
5370
5366
  try {
5371
5367
  const contents = fs.readFileSync(file, "utf8");
5372
- console.log(`Loaded ${contents} bytes from ${file}`);
5368
+ this._log(`Loaded ${contents.length} bytes from ${file}`);
5373
5369
 
5374
5370
  if (contents) {
5375
5371
  data.push({ file: file, contents: contents });
@@ -5381,7 +5377,7 @@ class Options {
5381
5377
  return Failed;
5382
5378
  };
5383
5379
 
5384
- console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
5380
+ // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
5385
5381
  if (path.isAbsolute(file)) {
5386
5382
  read(file);
5387
5383
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@andersbakken/fisk",
3
- "version": "4.0.7",
3
+ "version": "4.0.9",
4
4
  "description": "Fisk, a distributed compile system",
5
5
  "scripts": {
6
6
  "lint": "eslint . --ext .ts",
package/scheduler/fisk-scheduler.js CHANGED
@@ -53315,15 +53315,12 @@ class Options {
53315
53315
 
53316
53316
  value(name) {
53317
53317
  // foo-bar becomes FOO_BAR as env
53318
- // console.log("motherfuck value", name, this.argv);
53319
- if (name in this.argv) {
53318
+ if (name in this.argv)
53320
53319
  return this.argv[name];
53321
- }
53322
53320
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
53323
53321
  if (envname in process.env)
53324
53322
  return realValue(process.env[envname]);
53325
53323
 
53326
- // console.log(name, this.options);
53327
53324
  if (name in this.options)
53328
53325
  return this.options[name];
53329
53326
  return undefined;
@@ -53356,13 +53353,12 @@ class Options {
53356
53353
  const Success = 1;
53357
53354
  const Seen = 2;
53358
53355
  const read = file => {
53359
- console.log("trying fucking file", file, seen);
53360
53356
  if (seen.has(file))
53361
53357
  return Seen;
53362
53358
  seen.add(file);
53363
53359
  try {
53364
53360
  const contents = fs.readFileSync(file, "utf8");
53365
- console.log(`Loaded ${contents} bytes from ${file}`);
53361
+ this._log(`Loaded ${contents.length} bytes from ${file}`);
53366
53362
 
53367
53363
  if (contents) {
53368
53364
  data.push({ file: file, contents: contents });
@@ -53374,7 +53370,7 @@ class Options {
53374
53370
  return Failed;
53375
53371
  };
53376
53372
 
53377
- console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
53373
+ // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
53378
53374
  if (path.isAbsolute(file)) {
53379
53375
  read(file);
53380
53376
  } else {
@@ -53710,7 +53706,6 @@ function onObjectCacheCleared() {
53710
53706
  monitors.forEach((monitor) => monitor.send(info));
53711
53707
  }
53712
53708
  function setObjectCacheEnabled(on) {
53713
- console.log("fucking shit", on, typeof objectCache);
53714
53709
  if (on && !objectCache) {
53715
53710
  objectCache = new ObjectCacheManager(option);
53716
53711
  objectCache.on("cleared", onObjectCacheCleared);