Skip to content

Commit b9fd6df

Browse files
streamichstreamich
committed
feat: 🎸 shorten log messages
1 parent 7031f22 commit b9fd6df

File tree

1 file changed

+49
-80
lines changed

1 file changed

+49
-80
lines changed

‎src/nfs/v4/format.ts‎

Lines changed: 49 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -532,9 +532,7 @@ const formatBytes = (data: Uint8Array, maxLen = 32): string => {
532532
};
533533

534534
const formatStateid = (stateid: structs.Nfsv4Stateid, tab: string = ''): string => {
535-
return (
536-
'Stateid' + printTree(tab, [(tab) => `seqid = ${stateid.seqid}`, (tab) => `other = ${formatBytes(stateid.other)}`])
537-
);
535+
return `Stateid { seqid = ${stateid.seqid}, other = ${formatBytes(stateid.other)} }`;
538536
};
539537

540538
const formatFileHandle = (fh: structs.Nfsv4Fh): string => {
@@ -545,10 +543,7 @@ export const formatNfsv4Request = (req: msg.Nfsv4Request, tab: string = ''): str
545543
if (req instanceof msg.Nfsv4AccessRequest) {
546544
return 'ACCESS' + printTree(tab, [(tab) => `access = ${formatNfsv4Access(req.access)}`]);
547545
} else if (req instanceof msg.Nfsv4CloseRequest) {
548-
return (
549-
'CLOSE' +
550-
printTree(tab, [(tab) => `seqid = ${req.seqid}`, (tab) => `stateid = ${formatStateid(req.openStateid, tab)}`])
551-
);
546+
return `CLOSE seqid = ${req.seqid}, stateid = ${formatStateid(req.openStateid, tab)}`;
552547
} else if (req instanceof msg.Nfsv4CommitRequest) {
553548
return 'COMMIT' + printTree(tab, [(tab) => `offset = ${req.offset}`, (tab) => `count = ${req.count}`]);
554549
} else if (req instanceof msg.Nfsv4CreateRequest) {
@@ -635,7 +630,7 @@ export const formatNfsv4Request = (req: msg.Nfsv4Request, tab: string = ''): str
635630
])
636631
);
637632
} else if (req instanceof msg.Nfsv4PutfhRequest) {
638-
return 'PUTFH' + printTree(tab, [(tab) => `fh = ${formatFileHandle(req.object)}`]);
633+
return `PUTFH fh = ${formatFileHandle(req.object)}`;
639634
} else if (req instanceof msg.Nfsv4PutpubfhRequest) {
640635
return 'PUTPUBFH';
641636
} else if (req instanceof msg.Nfsv4PutrootfhRequest) {
@@ -707,140 +702,114 @@ export const formatNfsv4Request = (req: msg.Nfsv4Request, tab: string = ''): str
707702

708703
export const formatNfsv4Response = (res: msg.Nfsv4Response, tab: string = ''): string => {
709704
if (res instanceof msg.Nfsv4AccessResponse) {
710-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
711-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
712-
items.push((tab) => `supported = ${formatNfsv4Access(res.resok!.supported)}`);
713-
items.push((tab) => `access = ${formatNfsv4Access(res.resok!.access)}`);
714-
}
715-
return 'ACCESS' + printTree(tab, items);
705+
return `ACCESS (${formatNfsv4Stat(res.status)}) supported = ${formatNfsv4Access(res.resok!.supported)}, access = ${formatNfsv4Access(res.resok!.access)}`;
716706
} else if (res instanceof msg.Nfsv4CloseResponse) {
717-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
707+
const items: Array<(tab: string) => string> = [];
718708
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
719709
items.push((tab) => `stateid = ${formatStateid(res.resok!.openStateid, tab)}`);
720710
}
721-
return 'CLOSE' + printTree(tab, items);
711+
return `CLOSE (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
722712
} else if (res instanceof msg.Nfsv4CommitResponse) {
723-
return 'COMMIT' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
713+
return `COMMIT (${formatNfsv4Stat(res.status)})`;
724714
} else if (res instanceof msg.Nfsv4CreateResponse) {
725-
return 'CREATE' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
715+
return `CREATE (${formatNfsv4Stat(res.status)}) status = ${formatNfsv4Stat(res.status)}`);
726716
} else if (res instanceof msg.Nfsv4DelegpurgeResponse) {
727-
return 'DELEGPURGE' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
717+
return `DELEGPURGE (${formatNfsv4Stat(res.status)})`;
728718
} else if (res instanceof msg.Nfsv4DelegreturnResponse) {
729-
return 'DELEGRETURN' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
719+
return `DELEGRETURN (${formatNfsv4Stat(res.status)})`;
730720
} else if (res instanceof msg.Nfsv4GetattrResponse) {
731-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
721+
const items: Array<(tab: string) => string> = [];
732722
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
733723
items.push((tab) => `attrs = ${formatNfsv4Bitmap(res.resok!.objAttributes.attrmask)}`);
734724
}
735-
return 'GETATTR' + printTree(tab, items);
725+
return `GETATTR (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
736726
} else if (res instanceof msg.Nfsv4GetfhResponse) {
737-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
738-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
739-
items.push((tab) => `fh = ${formatFileHandle(res.resok!.object)}`);
740-
}
741-
return 'GETFH' + printTree(tab, items);
727+
return `GETFH (${formatNfsv4Stat(res.status)}) fh = ${formatFileHandle(res.resok!.object)}`;
742728
} else if (res instanceof msg.Nfsv4LinkResponse) {
743-
return 'LINK' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
729+
return `LINK (${formatNfsv4Stat(res.status)})`;
744730
} else if (res instanceof msg.Nfsv4LockResponse) {
745-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
746-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
747-
items.push((tab) => `stateid = ${formatStateid(res.resok!.lockStateid, tab)}`);
748-
}
749-
return 'LOCK' + printTree(tab, items);
731+
return `LOCK (${formatNfsv4Stat(res.status)}) stateid = ${formatStateid(res.resok!.lockStateid, tab)}`;
750732
} else if (res instanceof msg.Nfsv4LocktResponse) {
751-
return 'LOCKT' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
733+
return `LOCKT (${formatNfsv4Stat(res.status)})`;
752734
} else if (res instanceof msg.Nfsv4LockuResponse) {
753-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
754-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
755-
items.push((tab) => `stateid = ${formatStateid(res.resok!.lockStateid, tab)}`);
756-
}
757-
return 'LOCKU' + printTree(tab, items);
735+
return `LOCKU (${formatNfsv4Stat(res.status)}) stateid = ${formatStateid(res.resok!.lockStateid, tab)}`;
758736
} else if (res instanceof msg.Nfsv4LookupResponse) {
759-
return 'LOOKUP' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
737+
return `LOOKUP (${formatNfsv4Stat(res.status)})`;
760738
} else if (res instanceof msg.Nfsv4LookuppResponse) {
761-
return 'LOOKUPP' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
739+
return `LOCKUPP (${formatNfsv4Stat(res.status)})`;
762740
} else if (res instanceof msg.Nfsv4NverifyResponse) {
763-
return 'NVERIFY' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
741+
return `NVERIFY (${formatNfsv4Stat(res.status)})`;
764742
} else if (res instanceof msg.Nfsv4OpenResponse) {
765-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
766-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
767-
items.push((tab) => `stateid = ${formatStateid(res.resok!.stateid, tab)}`);
768-
}
769-
return 'OPEN' + printTree(tab, items);
743+
return `OPEN (${formatNfsv4Stat(res.status)}) stateid = ${formatStateid(res.resok!.stateid, tab)}`;
770744
} else if (res instanceof msg.Nfsv4OpenattrResponse) {
771-
return 'OPENATTR' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
745+
return `OPENATTR (${formatNfsv4Stat(res.status)})`;
772746
} else if (res instanceof msg.Nfsv4OpenConfirmResponse) {
773-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
747+
const items: Array<(tab: string) => string> = [];
774748
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
775749
items.push((tab) => `stateid = ${formatStateid(res.resok!.openStateid, tab)}`);
776750
}
777-
return 'OPEN_CONFIRM' + printTree(tab, items);
751+
return `OPEN_CONFIRM (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
778752
} else if (res instanceof msg.Nfsv4OpenDowngradeResponse) {
779-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
753+
const items: Array<(tab: string) => string> = [];
780754
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
781755
items.push((tab) => `stateid = ${formatStateid(res.resok!.openStateid, tab)}`);
782756
}
783-
return 'OPEN_DOWNGRADE' + printTree(tab, items);
757+
return `OPEN_DOWNGRADE (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
784758
} else if (res instanceof msg.Nfsv4PutfhResponse) {
785-
return 'PUTFH' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
759+
return `PUTFH (${formatNfsv4Stat(res.status)})`;
786760
} else if (res instanceof msg.Nfsv4PutpubfhResponse) {
787-
return 'PUTPUBFH' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
761+
return `PUTPUBFH (${formatNfsv4Stat(res.status)})`;
788762
} else if (res instanceof msg.Nfsv4PutrootfhResponse) {
789-
return 'PUTROOTFH' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
763+
return `PUTROOTFH (${formatNfsv4Stat(res.status)})`;
790764
} else if (res instanceof msg.Nfsv4ReadResponse) {
791-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
792-
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
793-
items.push((tab) => `eof = ${res.resok!.eof}`);
794-
items.push((tab) => `length = ${res.resok!.data.length}`);
795-
}
796-
return 'READ' + printTree(tab, items);
765+
return `READ (${formatNfsv4Stat(res.status)}) eof = ${res.resok!.eof} length = ${res.resok!.data.length}`;
797766
} else if (res instanceof msg.Nfsv4ReaddirResponse) {
798-
return 'READDIR' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
767+
return `READDIR (${formatNfsv4Stat(res.status)})`;
799768
} else if (res instanceof msg.Nfsv4ReadlinkResponse) {
800-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
769+
const items: Array<(tab: string) => string> = [];
801770
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
802771
items.push((tab) => `link = "${res.resok!.link}"`);
803772
}
804-
return 'READLINK' + printTree(tab, items);
773+
return `READLINK (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
805774
} else if (res instanceof msg.Nfsv4RemoveResponse) {
806-
return 'REMOVE' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
775+
return `REMOVE (${formatNfsv4Stat(res.status)})`;
807776
} else if (res instanceof msg.Nfsv4RenameResponse) {
808-
return 'RENAME' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
777+
return `RENAME (${formatNfsv4Stat(res.status)})`;
809778
} else if (res instanceof msg.Nfsv4RenewResponse) {
810-
return 'RENEW' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
779+
return `RENEW (${formatNfsv4Stat(res.status)})`;
811780
} else if (res instanceof msg.Nfsv4RestorefhResponse) {
812-
return 'RESTOREFH' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
781+
return `RESTOREFH (${formatNfsv4Stat(res.status)})`;
813782
} else if (res instanceof msg.Nfsv4SavefhResponse) {
814-
return 'SAVEFH' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
783+
return `SAVEFH (${formatNfsv4Stat(res.status)})`;
815784
} else if (res instanceof msg.Nfsv4SecinfoResponse) {
816-
return 'SECINFO' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
785+
return `SECINFO (${formatNfsv4Stat(res.status)})`;
817786
} else if (res instanceof msg.Nfsv4SetattrResponse) {
818-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
787+
const items: Array<(tab: string) => string> = [];
819788
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
820789
items.push((tab) => `attrsset = ${formatNfsv4Bitmap(res.resok!.attrsset)}`);
821790
}
822-
return 'SETATTR' + printTree(tab, items);
791+
return `SETATTR (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
823792
} else if (res instanceof msg.Nfsv4SetclientidResponse) {
824-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
793+
const items: Array<(tab: string) => string> = [];
825794
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
826795
items.push((tab) => `clientid = ${res.resok!.clientid}`);
827796
}
828-
return 'SETCLIENTID' + printTree(tab, items);
797+
return `SETCLIENTID (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
829798
} else if (res instanceof msg.Nfsv4SetclientidConfirmResponse) {
830-
return 'SETCLIENTID_CONFIRM' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
799+
return `SETCLIENTID_CONFIRM (${formatNfsv4Stat(res.status)})`;
831800
} else if (res instanceof msg.Nfsv4VerifyResponse) {
832-
return 'VERIFY' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
801+
return `VERIFY (${formatNfsv4Stat(res.status)})`;
833802
} else if (res instanceof msg.Nfsv4WriteResponse) {
834-
const items: Array<(tab: string) => string> = [(tab) => `status = ${formatNfsv4Stat(res.status)}`];
803+
const items: Array<(tab: string) => string> = [];
835804
if (res.status === constants.Nfsv4Stat.NFS4_OK && res.resok) {
836805
items.push((tab) => `count = ${res.resok!.count}`);
837806
items.push((tab) => `committed = ${formatNfsv4StableHow(res.resok!.committed)}`);
838807
}
839-
return 'WRITE' + printTree(tab, items);
808+
return `WRITE (${formatNfsv4Stat(res.status)})` + printTree(tab, items);
840809
} else if (res instanceof msg.Nfsv4ReleaseLockOwnerResponse) {
841-
return 'RELEASE_LOCKOWNER' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
810+
return `RELEASE_LOCKOWNER (${formatNfsv4Stat(res.status)})`;
842811
} else if (res instanceof msg.Nfsv4IllegalResponse) {
843-
return 'ILLEGAL' + printTree(tab, [(tab) => `status = ${formatNfsv4Stat(res.status)}`]);
812+
return `ILLEGAL (${formatNfsv4Stat(res.status)})`;
844813
}
845814
return 'Unknown Response';
846815
};

0 commit comments

Comments
 (0)