V 0.10.0 update

Author: HyoungSooo

Faker/process/base_processor.py

@@ -78,30 +78,30 @@ def _set_logs(self, token_id, node, time, by_fa=False):
 
     def _generate_sensor_log(self, sensors):
         base_sensor_log = [None] * self.senser_pointer
+        flag = True
         for sensor in sensors:
-            flag, data = sensor._get_values()
-            if flag:
-                if sensor.name in self.senser_hash:
-                    try:
-                        base_sensor_log[self.senser_hash[sensor.name]
-                                        ] = data
-                    except IndexError:
-                        diff = self.senser_hash[sensor.name] - \
-                            len(base_sensor_log)
-                        base_sensor_log += [None] * diff + \
-                            [data]
-                else:
-                    self.senser_hash[sensor.name] = self.senser_pointer
-                    diff = self.senser_hash[sensor.name] - len(base_sensor_log)
+            is_fine, data = sensor._get_values()
+
+            if flag and not is_fine:
+                flag = False
+
+            if sensor.name in self.senser_hash:
+                try:
+                    base_sensor_log[self.senser_hash[sensor.name]
+                                    ] = data
+                except IndexError:
+                    diff = self.senser_hash[sensor.name] - \
+                        len(base_sensor_log)
                     base_sensor_log += [None] * diff + \
                         [data]
-                    self.senser_pointer += 1
             else:
-                break
-        else:
-            return flag, base_sensor_log
+                self.senser_hash[sensor.name] = self.senser_pointer
+                diff = self.senser_hash[sensor.name] - len(base_sensor_log)
+                base_sensor_log += [None] * diff + \
+                    [data]
+                self.senser_pointer += 1
 
-        return flag, data
+        return flag, base_sensor_log
 
     def _generate_sensor_log_by_facility(self, sensors):
         sensor_log = [None] * len(sensors)

Faker/process/processor_stack.py

@@ -55,10 +55,10 @@ def _set_start_token(self, iter):
 
     def _set_logs(self, token_id, node, time):
         flag, sensor_log = self._generate_sensor_log(node.sensor)
+        log_entry = [token_id, node.name, datetime.strftime(self.now + timedelta(seconds=time) +
+                                                            timedelta(seconds=node.time), '%Y-%m-%d %H:%M:%S')] + sensor_log
+        self.logs.append(log_entry)
         if flag:
-            log_entry = [token_id, node.name, datetime.strftime(self.now + timedelta(seconds=time) +
-                                                                timedelta(seconds=node.time), '%Y-%m-%d %H:%M:%S')] + sensor_log
-            self.logs.append(log_entry)
             return node, time + node.time, True
         else:
             self.break_points[token_id] = sensor_log