@andersbakken/fisk 4.0.6 → 4.0.7

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 +7 -3
  2. package/daemon/fisk-daemon.js +7 -3
  3. package/monitor/fisk-monitor.js +7 -3
  4. package/package.json +1 -1
  5. package/scheduler/fisk-scheduler.js +10 -5
package/builder/fisk-builder.js CHANGED
@@ -54820,12 +54820,15 @@ class Options {
54820
54820
 
54821
54821
  value(name) {
54822
54822
  // foo-bar becomes FOO_BAR as env
54823
- if (name in this.argv)
54823
+ // console.log("motherfuck value", name, this.argv);
54824
+ if (name in this.argv) {
54824
54825
  return this.argv[name];
54826
+ }
54825
54827
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
54826
54828
  if (envname in process.env)
54827
54829
  return realValue(process.env[envname]);
54828
54830
 
54831
+ // console.log(name, this.options);
54829
54832
  if (name in this.options)
54830
54833
  return this.options[name];
54831
54834
  return undefined;
@@ -54858,12 +54861,13 @@ class Options {
54858
54861
  const Success = 1;
54859
54862
  const Seen = 2;
54860
54863
  const read = file => {
54864
+ console.log("trying fucking file", file, seen);
54861
54865
  if (seen.has(file))
54862
54866
  return Seen;
54863
54867
  seen.add(file);
54864
54868
  try {
54865
54869
  const contents = fs.readFileSync(file, "utf8");
54866
- this._log(`Loaded ${contents.length} bytes from ${file}`);
54870
+ console.log(`Loaded ${contents} bytes from ${file}`);
54867
54871
 
54868
54872
  if (contents) {
54869
54873
  data.push({ file: file, contents: contents });
@@ -54875,7 +54879,7 @@ class Options {
54875
54879
  return Failed;
54876
54880
  };
54877
54881
 
54878
- // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
54882
+ console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
54879
54883
  if (path.isAbsolute(file)) {
54880
54884
  read(file);
54881
54885
  } else {
package/daemon/fisk-daemon.js CHANGED
@@ -519,12 +519,15 @@ class Options {
519
519
 
520
520
  value(name) {
521
521
  // foo-bar becomes FOO_BAR as env
522
- if (name in this.argv)
522
+ // console.log("motherfuck value", name, this.argv);
523
+ if (name in this.argv) {
523
524
  return this.argv[name];
525
+ }
524
526
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
525
527
  if (envname in process.env)
526
528
  return realValue(process.env[envname]);
527
529
 
530
+ // console.log(name, this.options);
528
531
  if (name in this.options)
529
532
  return this.options[name];
530
533
  return undefined;
@@ -557,12 +560,13 @@ class Options {
557
560
  const Success = 1;
558
561
  const Seen = 2;
559
562
  const read = file => {
563
+ console.log("trying fucking file", file, seen);
560
564
  if (seen.has(file))
561
565
  return Seen;
562
566
  seen.add(file);
563
567
  try {
564
568
  const contents = fs$k.readFileSync(file, "utf8");
565
- this._log(`Loaded ${contents.length} bytes from ${file}`);
569
+ console.log(`Loaded ${contents} bytes from ${file}`);
566
570
 
567
571
  if (contents) {
568
572
  data.push({ file: file, contents: contents });
@@ -574,7 +578,7 @@ class Options {
574
578
  return Failed;
575
579
  };
576
580
 
577
- // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
581
+ console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
578
582
  if (path$h.isAbsolute(file)) {
579
583
  read(file);
580
584
  } else {
package/monitor/fisk-monitor.js CHANGED
@@ -5322,12 +5322,15 @@ class Options {
5322
5322
 
5323
5323
  value(name) {
5324
5324
  // foo-bar becomes FOO_BAR as env
5325
- if (name in this.argv)
5325
+ // console.log("motherfuck value", name, this.argv);
5326
+ if (name in this.argv) {
5326
5327
  return this.argv[name];
5328
+ }
5327
5329
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
5328
5330
  if (envname in process.env)
5329
5331
  return realValue(process.env[envname]);
5330
5332
 
5333
+ // console.log(name, this.options);
5331
5334
  if (name in this.options)
5332
5335
  return this.options[name];
5333
5336
  return undefined;
@@ -5360,12 +5363,13 @@ class Options {
5360
5363
  const Success = 1;
5361
5364
  const Seen = 2;
5362
5365
  const read = file => {
5366
+ console.log("trying fucking file", file, seen);
5363
5367
  if (seen.has(file))
5364
5368
  return Seen;
5365
5369
  seen.add(file);
5366
5370
  try {
5367
5371
  const contents = fs.readFileSync(file, "utf8");
5368
- this._log(`Loaded ${contents.length} bytes from ${file}`);
5372
+ console.log(`Loaded ${contents} bytes from ${file}`);
5369
5373
 
5370
5374
  if (contents) {
5371
5375
  data.push({ file: file, contents: contents });
@@ -5377,7 +5381,7 @@ class Options {
5377
5381
  return Failed;
5378
5382
  };
5379
5383
 
5380
- // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
5384
+ console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
5381
5385
  if (path.isAbsolute(file)) {
5382
5386
  read(file);
5383
5387
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@andersbakken/fisk",
3
- "version": "4.0.6",
3
+ "version": "4.0.7",
4
4
  "description": "Fisk, a distributed compile system",
5
5
  "scripts": {
6
6
  "lint": "eslint . --ext .ts",
package/scheduler/fisk-scheduler.js CHANGED
@@ -53315,12 +53315,15 @@ class Options {
53315
53315
 
53316
53316
  value(name) {
53317
53317
  // foo-bar becomes FOO_BAR as env
53318
- if (name in this.argv)
53318
+ // console.log("motherfuck value", name, this.argv);
53319
+ if (name in this.argv) {
53319
53320
  return this.argv[name];
53321
+ }
53320
53322
  const envname = (this.prefix + "_" + name).replace(/-/g, "_").toUpperCase();
53321
53323
  if (envname in process.env)
53322
53324
  return realValue(process.env[envname]);
53323
53325
 
53326
+ // console.log(name, this.options);
53324
53327
  if (name in this.options)
53325
53328
  return this.options[name];
53326
53329
  return undefined;
@@ -53353,12 +53356,13 @@ class Options {
53353
53356
  const Success = 1;
53354
53357
  const Seen = 2;
53355
53358
  const read = file => {
53359
+ console.log("trying fucking file", file, seen);
53356
53360
  if (seen.has(file))
53357
53361
  return Seen;
53358
53362
  seen.add(file);
53359
53363
  try {
53360
53364
  const contents = fs.readFileSync(file, "utf8");
53361
- this._log(`Loaded ${contents.length} bytes from ${file}`);
53365
+ console.log(`Loaded ${contents} bytes from ${file}`);
53362
53366
 
53363
53367
  if (contents) {
53364
53368
  data.push({ file: file, contents: contents });
@@ -53370,7 +53374,7 @@ class Options {
53370
53374
  return Failed;
53371
53375
  };
53372
53376
 
53373
- // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
53377
+ console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
53374
53378
  if (path.isAbsolute(file)) {
53375
53379
  read(file);
53376
53380
  } else {
@@ -53477,9 +53481,9 @@ var options = function(options, argv) {
53477
53481
  };
53478
53482
 
53479
53483
  const option = options({
53480
- prefix: "fisk/builder",
53484
+ prefix: "fisk/scheduler",
53481
53485
  noApplicationPath: true,
53482
- additionalFiles: ["fisk/builder.conf.override"]
53486
+ additionalFiles: ["fisk/scheduler.conf.override"]
53483
53487
  });
53484
53488
  const common = common$1(option);
53485
53489
  const server = new Server(option, common.Version);
@@ -53706,6 +53710,7 @@ function onObjectCacheCleared() {
53706
53710
  monitors.forEach((monitor) => monitor.send(info));
53707
53711
  }
53708
53712
  function setObjectCacheEnabled(on) {
53713
+ console.log("fucking shit", on, typeof objectCache);
53709
53714
  if (on && !objectCache) {
53710
53715
  objectCache = new ObjectCacheManager(option);
53711
53716
  objectCache.on("cleared", onObjectCacheCleared);