maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

S3BinaryCacheStore: Set Content-Type

Browse source 
This is necessary for serving log files to browsers.
This commit is contained in:
Eelco Dolstra 2017-03-14 15:26:01 +01:00
parent 8b1d65bebe
commit 45c70382ac
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
5 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/s3-binary-cache-store.cc
View file

@ -148,7 +148,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
: S3BinaryCacheStore(params)
, bucketName(bucketName)
, s3Helper(get(params, "aws-region", Aws::Region::US_EAST_1))
, textCompression(get(params, "text-compression", "gzip"))
, textCompression(get(params, "text-compression", ""))
, logCompression(get(params, "log-compression", textCompression))
{
diskCache = getNarInfoDiskCache();
@ -229,6 +229,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
}
void uploadFile(const std::string & path, const std::string & data,
const std::string & mimeType,
const std::string & contentEncoding)
{
auto request =
@ -236,6 +237,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
.WithBucket(bucketName)
.WithKey(path);
request.SetContentType(mimeType);
if (contentEncoding != "")
request.SetContentEncoding(contentEncoding);
@ -261,14 +264,15 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
stats.putTimeMs += duration;
}
void upsertFile(const std::string & path, const std::string & data) override
void upsertFile(const std::string & path, const std::string & data,
const std::string & mimeType) override
{
if (path.find(".narinfo") != std::string::npos)
uploadFile(path, *compress(textCompression, data), textCompression);
uploadFile(path, *compress(textCompression, data), mimeType, textCompression);
else if (path.find("/log") != std::string::npos)
uploadFile(path, *compress(logCompression, data), logCompression);
uploadFile(path, *compress(logCompression, data), mimeType, logCompression);
else
uploadFile(path, data, "");
uploadFile(path, data, mimeType, "");
}
void getFile(const std::string & path,