Merge branch 'master' into styling
This commit is contained in:
		
							
								
								
									
										1
									
								
								seasoned_api/.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								seasoned_api/.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -60,4 +60,5 @@ typings/ | |||||||
|  |  | ||||||
| # - - - - -  | # - - - - -  | ||||||
| # My own gitignore files and folders | # My own gitignore files and folders | ||||||
|  | shows.db | ||||||
| conf/ | conf/ | ||||||
|   | |||||||
| @@ -1,24 +0,0 @@ | |||||||
| { |  | ||||||
| 	"database": { |  | ||||||
| 		"host": "../shows.db" |  | ||||||
| 	}, |  | ||||||
| 	"webserver": { |  | ||||||
| 		"port": 31459 |  | ||||||
| 	}, |  | ||||||
| 	"tmdb": { |  | ||||||
| 		"apiKey": "" |  | ||||||
| 	}, |  | ||||||
| 	"raven": { |  | ||||||
| 		"DSN": "" |  | ||||||
| 	}, |  | ||||||
| 	"mail": { |  | ||||||
| 		"host": "", |  | ||||||
| 		"user": "", |  | ||||||
| 		"password": "", |  | ||||||
| 		"user_pi": "", |  | ||||||
| 		"password_pi": "" |  | ||||||
| 	}, |  | ||||||
| 	"authentication": { |  | ||||||
|     		"secret": "" |  | ||||||
|     	} |  | ||||||
| } |  | ||||||
| @@ -1 +0,0 @@ | |||||||
|  |  | ||||||
| @@ -33,7 +33,7 @@ class Cache { | |||||||
| 	 * @param {Number} timeToLive the number of seconds before entry expires | 	 * @param {Number} timeToLive the number of seconds before entry expires | ||||||
| 	 * @returns {Object} | 	 * @returns {Object} | ||||||
| 	 */ | 	 */ | ||||||
| 	 set(key, value, timeToLive = 86400) { | 	 set(key, value, timeToLive = 172800) { | ||||||
| 	 	const json = JSON.stringify(value); | 	 	const json = JSON.stringify(value); | ||||||
| 	 	return Promise.resolve() | 	 	return Promise.resolve() | ||||||
| 	 	.then(() => this.database.run(this.queries.create, [key, json, timeToLive])) | 	 	.then(() => this.database.run(this.queries.create, [key, json, timeToLive])) | ||||||
| @@ -41,4 +41,4 @@ class Cache { | |||||||
| 	 } | 	 } | ||||||
| } | } | ||||||
|  |  | ||||||
| module.exports = Cache; | module.exports = Cache; | ||||||
|   | |||||||
| @@ -1,4 +0,0 @@ | |||||||
| ::1 - - [02/Jun/2017:06:34:49 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" |  | ||||||
| ::1 - - [02/Jun/2017:06:34:50 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" |  | ||||||
| ::1 - - [02/Jun/2017:06:45:59 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" |  | ||||||
| ::1 - - [02/Jun/2017:06:48:30 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" |  | ||||||
		Reference in New Issue
	
	Block a user