pmcf 6.64.1 → 6.64.3

package/package.json

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

package/src/cluster.mjs

@@ -1,22 +1,25 @@
-import  { duration_attribute_writable} from "pacc";
-import { host } from "./host.mjs";
-
+import {
+  duration_attribute_writable,
+  default_collection_attribute_writable
+} from "pacc";
 import { addType } from "./type.mjs";
-import { networkInterfaces_attribute } from "./common-attributes.mjs";
+import { owner_attribute } from "./common-attributes.mjs";
+import { host } from "./host.mjs";
 
 export class cluster extends host {
   static priority = 1.5;
   static attributes = {
     members: {
-      ...networkInterfaces_attribute,
+      ...default_collection_attribute_writable,
+      type: "core",
+      backpointer: owner_attribute,
       name: "members"
     },
-        checkInterval: {
-          ...duration_attribute_writable,
-          name: "checkInterval",
-          default: 60
-        },
-    
+    checkInterval: {
+      ...duration_attribute_writable,
+      name: "checkInterval",
+      default: 60
+    }
   };
 
   static {

package/src/services/keepalived.mjs

@@ -6,13 +6,18 @@ import {
 } from "pacc";
 import { FAMILY_IPV4 } from "ip-utilties";
 import { addType } from "../type.mjs";
+import { PROTOCOL_TCP } from "../constants.mjs";
 import { core } from "../core.mjs";
 import { credential } from "../credential.mjs";
 import { CoreService, serviceEndpoints } from "../core-service.mjs";
-import { PROTOCOL_TCP } from "../constants.mjs";
 
 import { writeLines } from "../utils.mjs";
 
+const ROLE_PRIORITIES = {
+  master: 10,
+  backup: 0
+};
+
 export class keepalive_cluster_member extends core {
   static attributes = {
     cluster: {
@@ -23,7 +28,7 @@ export class keepalive_cluster_member extends core {
     role: {
       ...enum_string_attribute_writable,
       name: "role",
-      values: new Set(["master", "backup"])
+      values: new Set(Object.keys(ROLE_PRIORITIES))
     }
   };
   static key = "cluster";
@@ -51,6 +56,10 @@ export class keepalive_cluster_member extends core {
   get address() {
     return this.owner.owner.address;
   }
+
+  get priority() {
+    return this.owner.priority + ROLE_PRIORITIES[this.role];
+  }
 }
 
 export class keepalived extends CoreService {
@@ -67,39 +76,37 @@ export class keepalived extends CoreService {
     addType(this);
   }
 
-  clusters = new Map();
-  checkInterval = 60;
+  clusters = new Set();
 
   async *preparePackages(dir) {
     const packageData = await this.preparePackage(dir);
 
-    for (const clusterMember of this.clusters.values()) {
-      const cluster = clusterMember.cluster;
-      const host = cluster.host;
-
-      const extra = [];
+    const extra = [];
 
-      const smtp = this.smtp;
+    const smtp = this.smtp;
 
-      if (smtp) {
-        extra.push(`  smtp_server ${smtp.address()}`);
-      }
+    if (smtp) {
+      extra.push(`  smtp_server ${smtp.address()}`);
+    }
 
-      const cfg = [
-        "global_defs {",
-        "   notification_email {",
-        "    " + this.administratorEmail,
-        "  }",
-        ...extra,
-        `  notification_email_from keepalived@${host.domainName}`,
-        "  enable_script_security",
-        "  script_user root",
-        "  max_auto_priority 20",
-        "}",
-        ""
-      ];
+    const cfg = [
+      "global_defs {",
+      "   notification_email {",
+      "    " + this.administratorEmail,
+      "  }",
+      ...extra,
+      `  notification_email_from keepalived@${this.domainName}`,
+      "  enable_script_security",
+      "  script_user root",
+      "  max_auto_priority 20",
+      "}",
+      ""
+    ];
 
+    for (const clusterMember of this.clusters.values()) {
+      const cluster = clusterMember.cluster;
       const clusterName = cluster.name;
+
       cfg.push(`vrrp_instance ${clusterName} {`);
       cfg.push(`  state ${clusterMember.role.toUpperCase()}`);
 
@@ -123,20 +130,13 @@ export class keepalived extends CoreService {
 
       cfg.push(`  virtual_router_id ${cluster.id}`);
 
-      let reducedPrio = 0;
-      /*
-      let reducedPrio = cluster.masters.indexOf(ni);
-      if (reducedPrio < 0) {
-        reducedPrio = cluster.backups.indexOf(ni) + 5;
-      }
-*/
       const cred = new credential(this);
       cred.name = `keepalived.${clusterName}.password`;
       cred.localName = clusterName.toUpperCase() + "_PASSWORD";
       cred._tags.add("keepalived.service");
       this.credentials.set(cred.name, cred);
 
-      cfg.push(`  priority ${host.priority - reducedPrio}`);
+      cfg.push(`  priority ${clusterMember.priority}`);
       cfg.push("  smtp_alert");
       cfg.push("  advert_int 5");
       cfg.push("  authentication {");
@@ -170,7 +170,7 @@ export class keepalived extends CoreService {
             `services[types[${endpoint.type}]][0]`
           );
 
-          console.log(member.fullName, endpoint.type, memberService?.fullName);
+          //console.log(member.fullName, endpoint.type, memberService?.fullName);
           cfg.push(`  real_server ${member.address} ${memberService.port} {`);
           cfg.push(`    weight ${memberService.weight}`);