chore: refine debug info

Author: wchaws

source/constructs/lib/ecs-image-handler.ts

@@ -7,8 +7,8 @@ import * as ecs from '@aws-cdk/aws-ecs';
 import * as ecsPatterns from '@aws-cdk/aws-ecs-patterns';
 import * as iam from '@aws-cdk/aws-iam';
 import * as s3 from '@aws-cdk/aws-s3';
-import * as ssm from '@aws-cdk/aws-ssm';
 import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
+import * as ssm from '@aws-cdk/aws-ssm';
 import { Aws, CfnOutput, Construct, Duration, Stack } from '@aws-cdk/core';
 
 const GB = 1024;
@@ -184,14 +184,9 @@ function getOrCreateVpc(scope: Construct): ec2.IVpc {
 }
 
 function getTaskSubnets(scope: Construct, vpc: ec2.IVpc): ec2.ISubnet[] {
-  const subnetIds: string[] = scope.node.tryGetContext('subnet_ids');
-  // TODO: use filter subnets from vpc
-  let subnets: ec2.ISubnet[] = [];
-  if (subnetIds) {
-    subnetIds.forEach((subnetId, index) => {
-      subnets.push(ec2.Subnet.fromSubnetId(scope, 'subnet' + index, subnetId));
-    });
-    return subnets;
+  const subnetIds: string[] = scope.node.tryGetContext('subnet_ids') || [];
+  if (subnetIds.length) {
+    return subnetIds.map((subnetId, index) => ec2.Subnet.fromSubnetId(scope, 'subnet' + index, subnetId));
   } else {
     return vpc.privateSubnets;
   }

source/new-image-handler/src/debug.ts

@@ -43,27 +43,39 @@ export interface IDebugInfo {
     cpus: number;
     loadavg: number[];
   };
-  memoryStats: string;
-  memoryUsage: NodeJS.MemoryUsage;
-  cache?: {
+  memory: {
+    stats: string;
+    free: number;
+    total: number;
+    usage: NodeJS.MemoryUsage;
+  };
+  resource: {
+    usage: NodeJS.ResourceUsage;
+  };
+  lruCache?: {
     keys: number;
     sizeMB: number;
     ttlSec: number;
   };
-  resourceUsage: NodeJS.ResourceUsage;
   sharp: ISharpInfo;
 }
 
-export default function debug(cache?: LRUCache<string, CacheObject>): IDebugInfo {
+export default function debug(lruCache?: LRUCache<string, CacheObject>): IDebugInfo {
   const ret: IDebugInfo = {
     os: {
       arch: os.arch(),
       cpus: os.cpus().length,
       loadavg: os.loadavg(),
     },
-    memoryStats: `free: ${fmtmb(os.freemem())}, total: ${fmtmb(os.totalmem())}, usage ${Math.round(100 * (os.totalmem() - os.freemem()) / os.totalmem()) / 100} %`,
-    memoryUsage: process.memoryUsage(),
-    resourceUsage: process.resourceUsage(),
+    memory: {
+      stats: `free: ${formatBytes(os.freemem())}, total: ${formatBytes(os.totalmem())}, usage ${((os.totalmem() - os.freemem()) / os.totalmem() * 100).toFixed(2)} %`,
+      free: os.freemem(),
+      total: os.totalmem(),
+      usage: process.memoryUsage(),
+    },
+    resource: {
+      usage: process.resourceUsage(),
+    },
     sharp: {
       cache: sharp.cache(),
       simd: sharp.simd(),
@@ -72,17 +84,25 @@ export default function debug(cache?: LRUCache<string, CacheObject>): IDebugInfo
       versions: sharp.versions,
     },
   };
-  if (cache) {
-    ret.cache = {
-      keys: cache.size,
-      sizeMB: Math.round(cache.calculatedSize / 1048576 * 100) / 100,
-      ttlSec: Math.round(cache.ttl / 1000),
+  if (lruCache) {
+    ret.lruCache = {
+      keys: lruCache.size,
+      sizeMB: Math.round(b2mb(lruCache.calculatedSize) * 100) / 100,
+      ttlSec: Math.round(lruCache.ttl / 1000),
     };
   }
   return ret;
 }
 
-function fmtmb(v: number) {
-  return `${Math.round(v / 1048576 * 100) / 100} MB`;
+function b2mb(v: number) {
+  return v / 1048576;
 }
 
+function formatBytes(bytes: number) {
+  const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+  let i = 0;
+  for (; bytes >= 1024 && i < units.length - 1; i++) {
+    bytes /= 1024;
+  }
+  return `${bytes.toFixed(2)} ${units[i]}`;
+};

source/new-image-handler/src/index.ts

@@ -15,7 +15,7 @@ import { bufferStore, getProcessor, parseRequest, setMaxGifSizeMB, setMaxGifPage
 import * as is from './is';
 import { IHttpHeaders, InvalidArgument } from './processor';
 
-const MB = 1024 * 1024;
+const MB = 1048576;
 
 const ssm = new SSM({ region: config.region });
 const smclient = new SecretsManager({ region: config.region });