Migrate from bitbucket

.gitignore

@@ -1,2 +1,3 @@
 provisioning/nodes
 provisioning/local-mode-cache
+.DS_Store

REGULATION.md

@@ -1,22 +1,22 @@
 ## 概要
 
-Y!ISUCON を実施します。
+opt-isucon 2018 を実施します。
 
 以下開催詳細を記載します。
 
 ## 参加事項
 
-1チームは1-3人とします。ポータルサイトのチーム登録フォームよりご登録下さい。
-
+1チームは最低2人とします。
+ポータルサイトのチーム登録フォームよりご登録下さい。
 
 ## アプリケーションサーバ構成
 
 ### OS
-CentOS 7.2
+CentOS 7
 
 ### アプリケーション
 
-Ruby, Node.js, Go, PHP, Java によるWebアプリケーションが用意されています。
+Ruby, Node.js, Go, PHP, Java, Scala によるWebアプリケーションが用意されています。
 ただし各々の初期性能は一致していません。どれをベースに用いても構いません。独自で実装してもOKです。
 
 ### Nginx
@@ -28,7 +28,6 @@ WebサーバとしてデフォルトでNginxが起動しています。
 
 ユーザーは`root`、パスワードなし。
 
-
 ## アプリケーション起動
 
 初期設定ではNode.js実装のアプリケーションが起動しています。
@@ -46,12 +45,14 @@ WebサーバとしてデフォルトでNginxが起動しています。
 ### PHPの場合
 systemd での切り替えのほか、nginxの設定変更が必要です。`/etc/nginx/php-fpm.conf` が置いてあるのでそれを使用してください。
 
+## アプリケーションのデプロイ
+`/var/www/webapp/` 配下にアプリケーションが置かれています。
+それぞれの実行方法を記載します。
+
 ## ベンチマーク実行
 ポータルサイトから実行できます。
 チームごとログインし、アプリケーションサーバの設定とベンチマーク実行を行ってください。
 
-
-
 ## ルール詳細
 指定されたサーバー上のアプリケーションのチューニングをおこない、それに対するベンチマークのスコアで競技をおこないます。
 そのサーバー1台のみでアプリケーションの動作が可能であればどのような変更を加えても構いません。
@@ -64,7 +65,6 @@ systemd での切り替えのほか、nginxの設定変更が必要です。`/et
 - レスポンス(HTML)のDOM構造
 - JavaScript/CSSファイルの内容
 
-
 ### スコアについて
 基本スコアは以下のルールで算出されます。
 ```
@@ -90,5 +90,4 @@ systemd での切り替えのほか、nginxの設定変更が必要です。`/et
 以下の事項に抵触すると点数が無効となります。
 
 - GET /initialize へのレスポンスが10秒以内に終わらない
-- JavaScript/CSSファイルがアクセスできない
-
+- JavaScript/CSSファイルがアクセスできない

benchmarker/config/config.go

@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-var PortalHost = os.Getenv("YJ_ISUCON_PORTAL_HOST")
+var PortalHost = os.Getenv("OPT_ISUCON_PORTAL_HOST")
 
 const (
 	MaxWorkerCount     = 5
@@ -14,6 +14,6 @@ const (
 	BenchTimeLimit     = time.Minute
 	QueueCheckDuration = time.Second * 2
 	RequestTimeout     = time.Second * 30
-	BenchMarkerUA      = "YISUCON"
+	BenchMarkerUA      = "OPTISUCON"
 	LogFilePath        = "/tmp/isucon/benchmarker.log"
 )

benchmarker/db/db.go

@@ -29,11 +29,11 @@ func (db *DB) dsn() string {
 func (db *DB) connect() error {
 	db.Type = "mysql"
 
-	db.Host = os.Getenv("YJ_ISUCON_DB_HOST")
-	db.Port = os.Getenv("YJ_ISUCON_DB_PORT")
-	db.User = os.Getenv("YJ_ISUCON_DB_USER")
-	db.Pass = os.Getenv("YJ_ISUCON_DB_PASSWORD")
-	db.Name = os.Getenv("YJ_ISUCON_DB_NAME")
+	db.Host = os.Getenv("OPT_ISUCON_DB_HOST")
+	db.Port = os.Getenv("OPT_ISUCON_DB_PORT")
+	db.User = os.Getenv("OPT_ISUCON_DB_USER")
+	db.Pass = os.Getenv("OPT_ISUCON_DB_PASSWORD")
+	db.Name = os.Getenv("OPT_ISUCON_DB_NAME")
 
 	if len(db.Host) == 0 || len(db.Port) == 0 || len(db.User) == 0 || len(db.Name) == 0 {
 		db.Host = "localhost"

portal/README.md

@@ -7,12 +7,12 @@ yarn install
 
 環境変数に以下の値を入れること
 ```
-YJ_ISUCON_DB_HOST
-YJ_ISUCON_DB_USER
-YJ_ISUCON_DB_PASSWORD
-YJ_ISUCON_DB_PORT
-YJ_ISUCON_DB_NAME
-YJ_ISUCON_SECRET_KEY
+OPT_ISUCON_DB_HOST
+OPT_ISUCON_DB_USER
+OPT_ISUCON_DB_PASSWORD
+OPT_ISUCON_DB_PORT
+OPT_ISUCON_DB_NAME
+OPT_ISUCON_SECRET_KEY
 MYM_USER
 MYM_PASS
 ```

portal/allowAny.ts

@@ -0,0 +1,3 @@
+declare module 'jquery';
+declare module 'JQuery';
+declare module 'jsdom';

portal/package.json

@@ -30,110 +30,110 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "~2.2.1",
-    "@angular/compiler": "~2.2.1",
-    "@angular/compiler-cli": "~2.2.1",
-    "@angular/core": "~2.2.1",
-    "@angular/forms": "~2.2.1",
-    "@angular/http": "~2.2.1",
-    "@angular/platform-browser": "~2.2.1",
-    "@angular/platform-browser-dynamic": "~2.2.1",
-    "@angular/platform-server": "~2.2.1",
-    "@angular/router": "~3.2.1",
-    "@angularclass/bootloader": "^1.0.1",
-    "@angularclass/idle-preload": "^1.0.3",
-    "@ngtools/webpack": "^1.1.7",
-    "angular2-express-engine": "~2.1.0-rc.1",
-    "angular2-jwt": "^0.1.28",
-    "angular2-platform-node": "~2.1.0-rc.1",
-    "angular2-universal": "~2.1.0-rc.1",
-    "angular2-universal-polyfills": "~2.1.0-rc.1",
-    "bcrypt": "^1.0.1",
-    "body-parser": "^1.15.2",
-    "c3": "^0.4.11",
-    "compression": "^1.6.2",
-    "core-js": "^2.4.1",
-    "d3": "^3.5.17",
-    "dialog-polyfill": "^0.4.5",
-    "express": "^4.14.0",
-    "express-jsonschema": "^1.1.6",
-    "express-jwt": "^5.1.0",
-    "jsonwebtoken": "^7.2.1",
-    "material-design-icons": "^3.0.1",
-    "material-design-lite": "^1.2.1",
-    "morgan": "^1.7.0",
-    "mysql2": "^1.1.2",
-    "preboot": "~4.5.2",
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/forms": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/platform-server": "2.2.1",
+    "@angular/router": "3.2.1",
+    "@angularclass/bootloader": "1.0.1",
+    "@angularclass/idle-preload": "1.0.3",
+    "@ngtools/webpack": "1.1.7",
+    "angular2-express-engine": "2.1.0-rc.1",
+    "angular2-jwt": "0.1.28",
+    "angular2-platform-node": "2.1.0-rc.1",
+    "angular2-universal": "2.1.0-rc.1",
+    "angular2-universal-polyfills": "2.1.0-rc.1",
+    "bcrypt": "1.0.1",
+    "body-parser": "1.15.2",
+    "c3": "0.4.11",
+    "compression": "1.6.2",
+    "core-js": "2.4.1",
+    "d3": "3.5.17",
+    "dialog-polyfill": "0.4.5",
+    "express": "4.14.0",
+    "express-jsonschema": "1.1.6",
+    "express-jwt": "5.1.0",
+    "jsonwebtoken": "7.2.1",
+    "material-design-icons": "3.0.1",
+    "material-design-lite": "1.2.1",
+    "morgan": "1.7.0",
+    "mysql2": "1.1.2",
+    "preboot": "4.5.2",
     "rxjs": "5.0.0-beta.12",
-    "webfontloader": "^1.6.26",
-    "zone.js": "~0.6.26"
+    "webfontloader": "1.6.26",
+    "zone.js": "0.6.26"
   },
   "devDependencies": {
-    "@ngtools/webpack": "~1.1.7",
-    "@types/bcrypt": "^0.0.30",
+    "@ngtools/webpack": "1.1.7",
+    "@types/bcrypt": "0.0.30",
     "@types/body-parser": "0.0.29",
-    "@types/c3": "^0.4.38",
+    "@types/c3": "0.4.38",
     "@types/compression": "0.0.29",
-    "@types/cookie": "^0.1.29",
-    "@types/cookie-parser": "^1.3.29",
-    "@types/d3": "^3.5.37",
-    "@types/express": "^4.0.32",
-    "@types/express-jwt": "^0.0.33",
-    "@types/express-serve-static-core": "^4.0.33",
-    "@types/hammerjs": "^2.0.32",
-    "@types/jasmine": "^2.2.30",
-    "@types/jsdom": "^2.0.29",
-    "@types/jsonwebtoken": "^7.1.33",
+    "@types/cookie": "0.1.29",
+    "@types/cookie-parser": "1.3.29",
+    "@types/d3": "3.5.37",
+    "@types/express": "4.0.32",
+    "@types/express-jwt": "0.0.33",
+    "@types/express-serve-static-core": "4.0.33",
+    "@types/hammerjs": "2.0.32",
+    "@types/jasmine": "2.2.30",
+    "@types/jsonwebtoken": "7.1.33",
     "@types/mime": "0.0.28",
-    "@types/morgan": "^1.7.32",
-    "@types/node": "^6.0.38",
-    "@types/node-fetch": "^1.6.7",
-    "@types/serve-static": "^1.7.27",
-    "@types/webfontloader": "^1.6.27",
-    "angular2-template-loader": "^0.6.0",
-    "awesome-typescript-loader": "^2.2.4",
+    "@types/morgan": "1.7.32",
+    "@types/node": "6.0.38",
+    "@types/node-fetch": "1.6.7",
+    "@types/serve-static": "1.7.27",
+    "@types/webfontloader": "1.6.27",
+    "angular2-template-loader": "0.6.0",
+    "awesome-typescript-loader": "2.2.4",
     "codelyzer": "1.0.0-beta.1",
-    "cookie-parser": "^1.4.3",
-    "css-loader": "^0.26.1",
-    "exports-loader": "^0.6.3",
+    "cookie-parser": "1.4.3",
+    "css-loader": "0.26.1",
+    "exports-loader": "0.6.3",
     "extract-text-webpack-plugin": "2.0.0-beta.4",
-    "file-loader": "^0.9.0",
-    "iltorb": "^1.0.13",
-    "imports-loader": "^0.6.5",
-    "istanbul-instrumenter-loader": "^1.0.0",
+    "file-loader": "0.9.0",
+    "iltorb": "1.0.13",
+    "imports-loader": "0.6.5",
+    "istanbul-instrumenter-loader": "1.0.0",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
     "js.clone": "0.0.3",
-    "json-loader": "^0.5.4",
+    "json-loader": "0.5.4",
     "karma": "1.2.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-cli": "^1.0.1",
-    "karma-coverage": "^1.1.1",
-    "karma-jasmine": "^1.0.2",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-remap-coverage": "^0.1.2",
-    "karma-source-map-support": "^1.2.0",
-    "karma-webpack": "^1.8.0",
-    "nodemon": "^1.10.0",
-    "null-loader": "^0.1.1",
-    "phantomjs-prebuilt": "^2.1.13",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-cli": "1.0.1",
+    "karma-coverage": "1.1.1",
+    "karma-jasmine": "1.0.2",
+    "karma-phantomjs-launcher": "1.0.2",
+    "karma-remap-coverage": "0.1.2",
+    "karma-source-map-support": "1.2.0",
+    "karma-webpack": "1.8.0",
+    "nodemon": "1.10.0",
+    "null-loader": "0.1.1",
+    "phantomjs-prebuilt": "2.1.13",
     "protractor": "4.0.9",
-    "raw-loader": "^0.5.1",
+    "raw-loader": "0.5.1",
     "reflect-metadata": "0.1.8",
-    "rimraf": "^2.5.4",
-    "style-loader": "^0.13.1",
-    "to-string-loader": "^1.1.5",
-    "ts-helpers": "^1.1.2",
-    "ts-node": "^1.3.0",
-    "tslint": "^3.15.1",
+    "rimraf": "2.5.4",
+    "style-loader": "0.13.1",
+    "to-string-loader": "1.1.5",
+    "ts-helpers": "1.1.2",
+    "ts-node": "1.3.0",
+    "tslint": "3.15.1",
     "typescript": "2.0.10",
-    "url-loader": "^0.5.7",
-    "v8-lazy-parse-webpack-plugin": "^0.3.0",
+    "url-loader": "0.5.7",
+    "v8-lazy-parse-webpack-plugin": "0.3.0",
     "webpack": "2.1.0-beta.27",
     "webpack-bundle-analyzer": "1.4.1",
-    "webpack-dev-middleware": "^1.8.4",
+    "webpack-dev-middleware": "1.8.4",
     "webpack-dev-server": "2.1.0-beta.11",
-    "webpack-merge": "~0.16.0",
-    "yarn": "^0.19.1"
+    "webpack-merge": "0.16.0",
+    "webpack-sources": "1.1.0",
+    "yarn": "0.19.1"
   }
 }

portal/src/app/shared/ng-c3.module.ts

@@ -10,7 +10,7 @@ import '../../../node_modules/c3/c3.css';
     `.chart {width: 100%;}`,
   ]
 })
-class ChartComponent implements OnInit, OnChanges {
+export class ChartComponent implements OnInit, OnChanges {
   private chart: c3.ChartAPI;
   private c3obj: any;
 

portal/src/backend/api.ts

@@ -21,7 +21,7 @@ import { Subject } from 'rxjs';
 
 export const apiRouter = express.Router();
 
-const SECRET_KEY = process.env.YJ_ISUCON_SECRET_KEY || 'secret_key';
+const SECRET_KEY = process.env.OPT_ISUCON_SECRET_KEY || 'secret_key';
 const pool = db.createPool();
 const validateJsonSchema = expressJsonSchema.validate;
 const validateJwt = expressJwt({

portal/src/backend/db.ts

@@ -3,11 +3,11 @@ import * as mysql from 'mysql2';
 
 export function createPool() {
   return mysql.createPool({
-    host:     process.env.YJ_ISUCON_DB_HOST || 'localhost',
-    user:     process.env.YJ_ISUCON_DB_USER || 'root',
-    password: process.env.YJ_ISUCON_DB_PASSWORD || '',
-    port:     process.env.YJ_ISUCON_DB_PORT || '3306',
-    database: process.env.YJ_ISUCON_DB_NAME || 'isucon',
+    host:     process.env.OPT_ISUCON_DB_HOST || 'localhost',
+    user:     process.env.OPT_ISUCON_DB_USER || 'root',
+    password: process.env.OPT_ISUCON_DB_PASSWORD || '',
+    port:     process.env.OPT_ISUCON_DB_PORT || '3306',
+    database: process.env.OPT_ISUCON_DB_NAME || 'isucon',
     connectionLimit: 10
   });
 }

portal/src/server.ts

@@ -44,7 +44,7 @@ app.engine('.html', createEngine({
     // stateless providers only since it's shared
   ]
 }));
-app.set('port', process.env.PORT || 3000);
+app.set('port', 3000);
 app.set('views', __dirname);
 app.set('view engine', 'html');
 app.set('json spaces', 2);
@@ -105,6 +105,7 @@ app.get('*', function(req, res) {
 
 // Server
 process.on('uncaughtException', (err) => {
+  console.error(err);
   console.error('Catching errors to avoid process crash');
 });
 let server = app.listen(app.get('port'), () => {