pmcf 1.64.2 → 1.64.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.64.2",
+  "version": "1.64.4",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -297,7 +297,7 @@ export class Base {
 
   *findServices(filter) {
     if (this.owner) {
-      yield* this.owner?.findServices(filter);
+      yield* this.owner.findServices(filter);
     }
   }
 

package/src/cluster.mjs

@@ -75,9 +75,15 @@ export class Cluster extends Host {
       const name = `keepalived-${host.name}`;
       const packageStagingDir = join(stagingDir, name);
 
-      const cfg = ["global_defs {", "   notification_email {", "    " + this.administratorEmail, "  }",
+      const cfg = [
+        "global_defs {",
+        "   notification_email {",
+        "    " + this.administratorEmail,
+        "  }",
         "  smtp_server 192.168.1.1",
-        "}"];
+        `  notification_email_from keepalived@${host.domainName}`,
+        "}"
+      ];
 
       for (const cluster of [...this.owner.clusters()].sort((a, b) =>
         a.name.localeCompare(b.name)
@@ -101,7 +107,6 @@ export class Cluster extends Host {
         cfg.push("");
 
         for (const service of cluster.findServices({ type: "http" })) {
-          console.log("S", service.host.name, service.name);
           cfg.push(`virtual_server ${cluster.rawAddress} ${service.port} {`);
           cfg.push("  delay_loop 6");
           cfg.push("  lb_algo wlc");
@@ -109,13 +114,19 @@ export class Cluster extends Host {
           cfg.push(`  protocol ${service.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            cfg.push(`  real_server ${member.rawAddress} ${service.port} {`);
-            cfg.push("    weight 100");
-
-            if (service.protocol === "tcp") {
-              cfg.push(`    TCP_CHECK {`);
-              cfg.push("      connect_timeout 3");
-              cfg.push("    }");
+            const memberService = member.findService({ type: service.type });
+
+            cfg.push(
+              `  real_server ${member.rawAddress} ${memberService.port} {`
+            );
+            cfg.push(`    weight ${memberService.weight}`);
+
+            switch (service.protocol) {
+              case "tcp":
+                cfg.push(`    TCP_CHECK {`);
+                cfg.push("      connect_timeout 3");
+                cfg.push("    }");
+                break;
             }
 
             cfg.push("  }");

package/src/host.mjs

@@ -263,15 +263,18 @@ export class Host extends Base {
   }
 
   *findServices(filter) {
-    for (const service of this.#services) {
-      if (
-        !filter ||
-        filter.type === "*" ||
-        filter.type === service.type ||
-        filter.name === service.name
-      ) {
-        yield service;
+    if (filter) {
+      for (const service of this.#services) {
+        if (
+          filter.type === "*" ||
+          filter.type === service.type ||
+          filter.name === service.name
+        ) {
+          yield service;
+        }
       }
+    } else {
+      yield* this.#services;
     }
   }
 

package/src/service.mjs

@@ -131,7 +131,14 @@ export class Service extends Base {
   }
 
   get weight() {
-    return this.#weight || this.owner.weight || 0;
+    if (this.#weight !== undefined) {
+      return this.#weight;
+    }
+    if (this.owner.weight !== undefined) {
+      return this.owner.weight;
+    }
+
+    return 1;
   }
 
   set type(value) {