updating oss-performance to work with recent changes to invariant sig… (

#78) * updating oss-performance to work with recent changes to invariant signature * updating change to reflect comments * changing %s to %f for a numeric value
facebookarchive · Jan 31, 2017 · adb976a · adb976a
1 parent 9dd9706
commit adb976a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/base/BuildChecker.php b/base/BuildChecker.php
@@ -39,7 +39,7 @@ public static function Check(
       if ($skipKeys->contains($k)) {
         continue;
       }
-      invariant(is_array($v), $k.' is not an array');
+      invariant(is_array($v), '%s is not an array', $k);
       $v = self::MakeCheckedValue($v);
       if ($v['OK']) {
         continue;

diff --git a/base/PerfRunner.php b/base/PerfRunner.php
@@ -84,7 +84,8 @@ private static function RunWithOptionsAndEngine(
     Process::sleepSeconds($options->delayPhpStartup);
     invariant(
       $php_engine->isRunning(),
-      'Failed to start '.get_class($php_engine),
+      'Failed to start %s',
+      get_class($php_engine),
     );
 
     if ($target->needsUnfreeze()) {
@@ -114,7 +115,8 @@ private static function RunWithOptionsAndEngine(
       invariant(!$siege->isRunning(), 'Siege is still running :/');
       invariant(
         $php_engine->isRunning(),
-        get_class($php_engine).' crashed',
+        '%s crashed',
+        get_class($php_engine),
       );
     } else {
       self::PrintProgress('Skipping single request warmup');
@@ -130,7 +132,8 @@ private static function RunWithOptionsAndEngine(
       invariant(!$siege->isRunning(), 'Siege is still running :/');
       invariant(
         $php_engine->isRunning(),
-        get_class($php_engine).' crashed',
+        '%s crashed',
+        get_class($php_engine),
       );
     } else {
       self::PrintProgress('Skipping multi request warmup');

diff --git a/base/PerfTarget.php b/base/PerfTarget.php
@@ -30,7 +30,9 @@ final public function sanityCheck(): void {
     $content = file_get_contents($url, /* include path = */ false, $ctx);
     invariant(
       strstr($content, $this->getSanityCheckString()) !== false,
-      'Failed to find string "'.$this->getSanityCheckString().'" in '.$url,
+      'Failed to find string "%s" in %s',
+      $this->getSanityCheckString(),
+      $url,
     );
   }
 

diff --git a/base/Siege.php b/base/Siege.php
@@ -146,7 +146,7 @@ protected function getArguments(): Vector<string> {
         return $arguments;
       default:
         invariant_violation(
-          'Unexpected request mode: '.(string) $this->mode,
+          'Unexpected request mode: %s', (string) $this->mode,
         );
     }
   }

diff --git a/targets/wordpress/WordpressTarget.php b/targets/wordpress/WordpressTarget.php
@@ -100,11 +100,9 @@ private function unfreezeRequest(PerfOptions $options): void {
     $data = file_get_contents($url, /* include path = */ false, $ctx);
     invariant(
       $data !== false,
-      'Failed to unfreeze '.
-      $url.
-      ' after '.
-      $options->maxdelayUnfreeze.
-      ' secs',
+      'Failed to unfreeze %s after %f secs',
+      $url,
+      $options->maxdelayUnfreeze,
     );
   }
 }