Skip to content

Commit fc228bf

Browse files
committed
Fixing BlobTrigger bug
1 parent 3dc668e commit fc228bf

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

src/WebJobs.Script/Description/NodeFunctionInvoker.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,14 @@ private Dictionary<string, object> CreateScriptExecutionContext(object input, Tr
321321
}
322322
input = inputValues;
323323
}
324+
else if (typeof(Stream).IsAssignableFrom(triggerParameterType))
325+
{
326+
Stream inputStream = (Stream)input;
327+
using (StreamReader sr = new StreamReader(inputStream))
328+
{
329+
input = sr.ReadToEnd();
330+
}
331+
}
324332

325333
bindings.Add(_trigger.Name, input);
326334

src/WebJobs.Script/Diagnostics/FastLogger.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,13 @@ public FastLogger(string accountConnectionString)
2727
this._writer = LogFactory.NewWriter(containerName, table);
2828
}
2929

30-
// SDK notification gives us the full name, which came from Ref.Emit.
31-
// It's 'Type.Method'. We just want 'Method'
32-
private static string GetShortName(string fullname)
33-
{
34-
int i = fullname.LastIndexOf('.');
35-
if (i != -1)
36-
{
37-
return fullname.Substring(i + 1);
38-
}
39-
return fullname;
40-
}
41-
4230
public async Task AddAsync(FunctionInstanceLogEntry item, CancellationToken cancellationToken = default(CancellationToken))
4331
{
4432
// Convert Host to Protocol so we can log it
4533
var settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
4634
var jsonClone = JsonConvert.SerializeObject(item, settings);
4735
var item2 = JsonConvert.DeserializeObject<FunctionInstanceLogItem>(jsonClone);
48-
item2.FunctionName = GetShortName(item2.FunctionName);
36+
item2.FunctionName = Utility.GetFunctionShortName(item2.FunctionName);
4937
await _writer.AddAsync(item2);
5038
}
5139

0 commit comments

Comments
 (0)